[GNUnet-SVN] r1567 - GNUnet/src/util

[grothoff]

Author: grothoff
Date: 2005-07-16 14:25:05 -0700 (Sat, 16 Jul 2005)
New Revision: 1567

Modified:
   GNUnet/src/util/checksum.c
   GNUnet/src/util/hostkey_gcrypt.c
   GNUnet/src/util/statuscalls.c
Log:
may not have iconv

Modified: GNUnet/src/util/checksum.c
===================================================================
--- GNUnet/src/util/checksum.c  2005-07-16 21:16:08 UTC (rev 1566)
+++ GNUnet/src/util/checksum.c  2005-07-16 21:25:05 UTC (rev 1567)
@@ -139,16 +139,21 @@
 char * convertToUtf8(const char * input,
                     size_t len,
                     const char * charset) {
+  char * ret;
+#if ENABLE_NLS
   size_t tmpSize;
   size_t finSize;
   char * tmp;
-  char * ret;
   char * itmp;
   iconv_t cd;
 
   cd = iconv_open("UTF-8", charset);
-  if (cd == (iconv_t) -1)
-    return strdup(charset);
+  if (cd == (iconv_t) -1) {
+    ret = malloc(len+1);
+    memcpy(ret, input, len);
+    ret[len] = '\0';
+    return ret;
+  }
   tmpSize = 3 * len + 4;
   tmp = malloc(tmpSize);
   itmp = tmp;
@@ -160,7 +165,10 @@
            &finSize) == (size_t)-1) {
     iconv_close(cd);
     free(tmp);
-    return strdup(charset);
+    ret = malloc(len+1);
+    memcpy(ret, input, len);
+    ret[len] = '\0';
+    return ret;
   }
   ret = malloc(tmpSize - finSize + 1);
   memcpy(ret,
@@ -170,6 +178,12 @@
   free(tmp);
   iconv_close(cd);
   return ret;
+#else
+  ret = malloc(len+1);
+  memcpy(ret, input, len);
+  ret[len] = '\0';
+  return ret;
+#endif
 }
 
 

Modified: GNUnet/src/util/hostkey_gcrypt.c
===================================================================
--- GNUnet/src/util/hostkey_gcrypt.c    2005-07-16 21:16:08 UTC (rev 1566)
+++ GNUnet/src/util/hostkey_gcrypt.c    2005-07-16 21:25:05 UTC (rev 1567)
@@ -70,8 +70,8 @@
  * first target-size bytes.
  */
 static void adjust(char * buf,
-                  int size,
-                  int target) {
+                  size_t size,
+                  size_t target) {
   if (size < target) {
     memmove(&buf[target-size],
            buf,
@@ -192,7 +192,7 @@
 void getPublicKey(const struct PrivateKey * hostkey,
                  PublicKey * result) {
   gcry_mpi_t skey[2];
-  int size;
+  size_t size;
   int rc;
 
   lockGcrypt();

Modified: GNUnet/src/util/statuscalls.c
===================================================================
--- GNUnet/src/util/statuscalls.c       2005-07-16 21:16:08 UTC (rev 1566)
+++ GNUnet/src/util/statuscalls.c       2005-07-16 21:25:05 UTC (rev 1567)
@@ -152,9 +152,9 @@
 #define MAX_PROC_LINE 5000
 
 static void updateInterfaceTraffic() {
+#ifdef LINUX
   unsigned long long rxnew;
   unsigned long long txnew;
-#ifdef LINUX
   char line[MAX_PROC_LINE];
   char * data;
   int i;
@@ -199,6 +199,8 @@
   MUTEX_UNLOCK(&statusMutex);
     
 #elif MINGW
+  unsigned long long rxnew;
+  unsigned long long txnew;
   int i;
   PMIB_IFTABLE pTable;
   DWORD dwIfIdx;