From 87a5fd33fef839b0e1ee0ee250be56f589018ad7 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 8 May 2002 10:05:17 +0000 Subject: 2002-05-08 Roland McGrath * conn.c (ftpfs_get_ftp_conn): Cast to uintptr_t before void *. * ftpfs.c (cntl_debug): Vice versa. --- ftpfs/conn.c | 7 ++++--- ftpfs/ftpfs.c | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ftpfs/conn.c b/ftpfs/conn.c index 930e2eb7..9be7dd28 100644 --- a/ftpfs/conn.c +++ b/ftpfs/conn.c @@ -1,6 +1,6 @@ /* Ftp connection management - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997,2002 Free Software Foundation, Inc. Written by Miles Bader This file is part of the GNU Hurd. @@ -19,11 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ #include +#include #include "ftpfs.h" /* A particular connection. */ -struct ftpfs_conn +struct ftpfs_conn { struct ftp_conn *conn; struct ftpfs_conn *next; @@ -69,7 +70,7 @@ ftpfs_get_ftp_conn (struct ftpfs *fs, struct ftp_conn **conn) } /* For debugging purposes, give each connection a unique integer id. */ - fsc->conn->hook = (void *)conn_id++; + fsc->conn->hook = (void *)(uintptr_t)conn_id++; } spin_lock (&fs->conn_lock); diff --git a/ftpfs/ftpfs.c b/ftpfs/ftpfs.c index 86fea34c..9ff8ef46 100644 --- a/ftpfs/ftpfs.c +++ b/ftpfs/ftpfs.c @@ -87,7 +87,8 @@ cntl_debug (struct ftp_conn *conn, int type, const char *txt) mutex_lock (&debug_lock); if (debug_stream) { - fprintf (debug_stream, "%u.%s%s\n", (unsigned)conn->hook, type_str, txt); + fprintf (debug_stream, "%u.%s%s\n", + (unsigned)(uintptr_t)conn->hook, type_str, txt); fflush (debug_stream); } mutex_unlock (&debug_lock); -- cgit v1.2.3