File librsync-0.9.7-strictalias.diff of Package librsync

File librsync-0.9.7-strictalias.diff of Package librsync (Revision 2)

Currently displaying revision 2, show latest

Index: netint.c
===================================================================
--- netint.c.orig	2004-09-17 23:35:50.000000000 +0200
+++ netint.c	2007-09-02 10:10:50.000000000 +0200
@@ -121,7 +121,7 @@ rs_squirt_n4(rs_job_t *job, int val)
 rs_result
 rs_suck_netint(rs_job_t *job, rs_long_t *v, int len)
 {
-    unsigned char       *buf;
+    void		*buf;
     int                 i;
     rs_result           result;
 
@@ -130,13 +130,13 @@ rs_suck_netint(rs_job_t *job, rs_long_t 
         return RS_INTERNAL_ERROR;
     }
 
-    if ((result = rs_scoop_read(job, len, (void **) &buf)) != RS_DONE)
+    if ((result = rs_scoop_read(job, len, &buf)) != RS_DONE)
         return result;
 
     *v = 0;
 
     for (i = 0; i < len; i++) {
-        *v = *v<<8 | buf[i];
+        *v = *v<<8 | ((unsigned char*)buf)[i];
     }
 
     return RS_DONE;
Index: readsums.c
===================================================================
--- readsums.c.orig	2004-02-08 00:17:57.000000000 +0100
+++ readsums.c	2007-09-02 10:10:50.000000000 +0200
@@ -111,15 +111,15 @@ static rs_result rs_loadsig_s_weak(rs_jo
 static rs_result rs_loadsig_s_strong(rs_job_t *job)
 {
     rs_result           result;
-    rs_strong_sum_t     *strongsum;
+    void		*strongsum;
 
     result = rs_scoop_read(job, job->signature->strong_sum_len,
-                           (void **) &strongsum);
+                           &strongsum);
     if (result != RS_DONE) return result;
 
     job->statefn = rs_loadsig_s_weak;
 
-    return rs_loadsig_add_sum(job, strongsum);
+    return rs_loadsig_add_sum(job, (rs_strong_sum_t*)strongsum);
 }