[libEtPan-commits] CVS: libetpan/tools charconv.c,1.5,1.6 cinthash.c,1.3,1.4 connect.c,1.6,1.7 connect.h,1.7,1.8 maillock.c,1.1,1.2

[DINH V. Ho? <ho...@us...>]

Update of /cvsroot/libetpan/libetpan/tools
In directory usw-pr-cvs1:/tmp/cvs-serv16253/tools

Modified Files:
	charconv.c cinthash.c connect.c connect.h maillock.c 
Log Message:
some portability issues and removed warning

Index: charconv.c
===================================================================
RCS file: /cvsroot/libetpan/libetpan/tools/charconv.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- charconv.c	24 Jun 2002 23:50:35 -0000	1.5
+++ charconv.c	25 Jun 2002 23:18:05 -0000	1.6
@@ -101,7 +101,8 @@
 		    char ** result, size_t * result_len)
 {
   iconv_t conv;
-  size_t r;
+  size_t iconv_r;
+  int r;
   char * out;
   char * pout;
   size_t out_size;
@@ -132,11 +133,11 @@
   pout = out;
   old_out_size = out_size;
 
-  r = iconv(conv, &str, &length, &pout, &out_size);
+  iconv_r = iconv(conv, &str, &length, &pout, &out_size);
 
   iconv_close(conv);
 
-  if (r == (size_t) -1) {
+  if (iconv_r == (size_t) -1) {
     res = MAIL_CHARCONV_ERROR_CONV;
     goto free;
   }

Index: cinthash.c
===================================================================
RCS file: /cvsroot/libetpan/libetpan/tools/cinthash.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cinthash.c	23 May 2002 22:26:10 -0000	1.3
+++ cinthash.c	25 Jun 2002 23:18:05 -0000	1.4
@@ -135,7 +135,7 @@
 
 void cinthash_free(cinthash_t * table)
 {
-  int i;
+  unsigned long i;
 
   for(i = 0 ; i < table->hashtable_size ; i++)
     hash_list_free(table->table[i].next);

Index: connect.c
===================================================================
RCS file: /cvsroot/libetpan/libetpan/tools/connect.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- connect.c	25 Jun 2002 10:14:59 -0000	1.6
+++ connect.c	25 Jun 2002 23:18:05 -0000	1.7
@@ -34,10 +34,11 @@
  */
 
 #include "connect.h"
+
+#include <sys/types.h>
 #include <string.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 
 uint16_t get_service_port(char * name, char * protocol)

Index: connect.h
===================================================================
RCS file: /cvsroot/libetpan/libetpan/tools/connect.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- connect.h	25 Jun 2002 19:16:30 -0000	1.7
+++ connect.h	25 Jun 2002 23:18:05 -0000	1.8
@@ -38,7 +38,6 @@
 #define CONNECT_H
 
 #include <inttypes.h>
-#include <netdb.h>
 
 uint16_t get_service_port(char * name, char * protocol);
 int tcp_connect(char * server, uint16_t port);

Index: maillock.c
===================================================================
RCS file: /cvsroot/libetpan/libetpan/tools/maillock.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- maillock.c	24 Jun 2002 23:50:35 -0000	1.1
+++ maillock.c	25 Jun 2002 23:18:05 -0000	1.2
@@ -40,6 +40,8 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <unistd.h>
+#include <stdio.h>
+#include <time.h>
 
 /* ********************************************************************** */