[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    05/12/28 21:33:24

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonHasher_c.c 
        src/networks/fasttrack: fst_crypt.c 
        src/utils/lib  : charsetstubs.c stubs_c.c 

Log message:
        patch #4704

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.638&tr2=1.639&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonHasher_c.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/fasttrack/fst_crypt.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/charsetstubs.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/stubs_c.c.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.638 mldonkey/distrib/ChangeLog:1.639
--- mldonkey/distrib/ChangeLog:1.638    Wed Dec 28 21:28:29 2005
+++ mldonkey/distrib/ChangeLog  Wed Dec 28 21:33:24 2005
@@ -12,6 +12,7 @@
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
 2005/12/28
+4704: Fix some C compile warnings (schlumpf)
 4739: Fix some cross-compiling obstacles, remove Ocaml 3.08.2 compatability
 * Cross-compiling is only possible with a correct Ocaml toolchain
 * MLDonkey can not build this Ocaml toolchain
Index: mldonkey/src/daemon/common/commonHasher_c.c
diff -u mldonkey/src/daemon/common/commonHasher_c.c:1.9 
mldonkey/src/daemon/common/commonHasher_c.c:1.10
--- mldonkey/src/daemon/common/commonHasher_c.c:1.9     Tue Dec 13 12:43:47 2005
+++ mldonkey/src/daemon/common/commonHasher_c.c Wed Dec 28 21:33:24 2005
@@ -21,10 +21,10 @@
 #include "../../../config/config.h"
 #include "../../utils/lib/os_stubs.h"
 
-#include "caml/mlvalues.h"
-#include "caml/fail.h"
-#include "caml/alloc.h"
-#include "caml/signals.h"
+#include <caml/mlvalues.h>
+#include <caml/fail.h>
+#include <caml/alloc.h>
+#include <caml/signals.h>
 
 #define METHOD_MD4      Val_int(0)
 #define METHOD_MD5      Val_int(1)
@@ -286,6 +286,8 @@
 static pthread_cond_t cond;
 static pthread_mutex_t mutex;
 
+static char *p_job_result = (char *)job_result;
+
 value ml_job_done(value job_v)
 {
   if(job_done){
@@ -294,7 +296,7 @@
     int result_len = string_length(result_v);
 
 /*    printf("job len done: %d\n", result_len);     */
-    memcpy(result, job_result, result_len);
+    memcpy(result, p_job_result, result_len);
     return Val_true;
   }
 
@@ -331,17 +333,17 @@
 /*      fprintf(stderr,"job started\n");   */
       
       if(job_method == METHOD_MD4)
-        md4_unsafe64_fd_direct(job_fd, job_begin_pos, job_len, job_result);
+        md4_unsafe64_fd_direct(job_fd, job_begin_pos, job_len, p_job_result);
       else
         if( job_method == METHOD_MD5)
-          md5_unsafe64_fd_direct(job_fd, job_begin_pos, job_len, job_result);
+          md5_unsafe64_fd_direct(job_fd, job_begin_pos, job_len, p_job_result);
         else
           if( job_method == METHOD_SHA1)
-            sha1_unsafe64_fd_direct(job_fd, job_begin_pos, job_len, 
job_result);
+            sha1_unsafe64_fd_direct(job_fd, job_begin_pos, job_len, 
p_job_result);
           else 
             if( job_method == METHOD_TIGER){
               long bsize = tiger_block_size(job_len);
-              tiger_tree_fd(job_fd, job_len, 0, bsize, job_result);
+              tiger_tree_fd(job_fd, job_len, 0, bsize, p_job_result);
             } else {
               printf("commonHasher_c.c: method sha1 not implemented\n");
               exit(2);
Index: mldonkey/src/networks/fasttrack/fst_crypt.c
diff -u mldonkey/src/networks/fasttrack/fst_crypt.c:1.9 
mldonkey/src/networks/fasttrack/fst_crypt.c:1.10
--- mldonkey/src/networks/fasttrack/fst_crypt.c:1.9     Mon Aug  1 23:53:54 2005
+++ mldonkey/src/networks/fasttrack/fst_crypt.c Wed Dec 28 21:33:24 2005
@@ -98,9 +98,7 @@
 
 int fst_cipher_init (FSTCipher *cipher, unsigned int seed, unsigned int 
enc_type)
 {
-       int i,j;
-       unsigned int temp;
-       unsigned int sortpos;
+       unsigned int j, i, temp, sortpos;
        unsigned char c;
 
        cipher->enc_type = enc_type;
@@ -216,9 +214,7 @@
 
 static int pad_init (unsigned int *pseed, unsigned int enc_type, unsigned 
char* pad, unsigned int pad_size)
 {
-       int i;
-       unsigned int temp;
-       unsigned int seed = *pseed;
+       unsigned int temp, i, seed = *pseed;
        
        memset (pad, 0, pad_size);
 
@@ -340,7 +336,7 @@
         */
        if (cipher->pos == 7 && ((xor & 0x70) == 0))
        {
-               int i;
+               unsigned int i;
                /* Which 5 elements should we sort?  We calculate this in a
                 * pretty odd manner. */
                int sortpos = xor + cipher->pad[2];
Index: mldonkey/src/utils/lib/charsetstubs.c
diff -u mldonkey/src/utils/lib/charsetstubs.c:1.6 
mldonkey/src/utils/lib/charsetstubs.c:1.7
--- mldonkey/src/utils/lib/charsetstubs.c:1.6   Mon Jul  4 20:22:37 2005
+++ mldonkey/src/utils/lib/charsetstubs.c       Wed Dec 28 21:33:24 2005
@@ -1198,7 +1198,7 @@
 
 size_t 
 ml_iconv (iconv_t cd,
-          char    **inbuf,
+          const char    **inbuf,
           size_t  *inbytes_left,
           char    **outbuf,
           size_t  *outbytes_left)
@@ -1234,7 +1234,7 @@
 
  again:
   
-  err = ml_iconv (cd, (char **)&p, &inbytes_remaining, &outp, 
&outbytes_remaining);
+  err = ml_iconv (cd, (const char **)&p, &inbytes_remaining, &outp, 
&outbytes_remaining);
 
   if (err == (size_t) -1)
     {
Index: mldonkey/src/utils/lib/stubs_c.c
diff -u mldonkey/src/utils/lib/stubs_c.c:1.28 
mldonkey/src/utils/lib/stubs_c.c:1.29
--- mldonkey/src/utils/lib/stubs_c.c:1.28       Wed Nov 30 23:46:25 2005
+++ mldonkey/src/utils/lib/stubs_c.c    Wed Dec 28 21:33:24 2005
@@ -23,6 +23,7 @@
 #include <string.h> 
 #include <ctype.h>
 #include <caml/config.h>
+#include <caml/signals.h>
 
 #define lseek XXXXXXXXX
 #define read XXXXXXXXX
@@ -30,9 +31,6 @@
 
 #define UNIX_BUFFER_SIZE 16384
 
-extern void enter_blocking_section(); 
-extern void leave_blocking_section();
-
 
 /*******************************************************************