Ticket #494: fix.diff

\./zfec/_fecmodule.c

@@ -551 +551 @@
 
 void
 _hexwrite(unsigned char*s, size_t l) {
-  for (size_t i = 0; i < l; i++)
+  size_t i;
+  for (i = 0; i < l; i++)
     printf("%.2x", s[i]);
 }
 
 PyObject*
 test_from_agl() {
-  unsigned char b0c[8], b1c[8];
-  unsigned char b0[8], b1[8], b2[8], b3[8], b4[8];
-  memset(b0, 1, 8);
-  memset(b1, 2, 8);
-  memset(b2, 3, 8);
+  unsigned char b0[8] = {1,1,1,1,1,1,1,1};
+  unsigned char b1[8] = {2,2,2,2,2,2,2,2};
+  unsigned char b2[8] = {3,3,3,3,3,3,3,3};
+  unsigned char b3[8], b4[8];
+  unsigned char b0c[8] = {1,1,1,1,1,1,1,1};
+  unsigned char b1c[8] = {2,2,2,2,2,2,2,2};
+
   const unsigned char *blocks[3] = {b0, b1, b2};
   unsigned char *outblocks[2] = {b3, b4};
   unsigned block_nums[] = {3, 4};
 
+  const unsigned char *inpkts[] = {b3, b4, b2};
+  unsigned char *outpkts[] = {b0, b1};
+  unsigned indexes[] = {3, 4, 2};
+
   /*printf("_from_c before encoding:\n");
   printf("b0: "); _hexwrite(b0, 8); printf(", ");
   printf("b1: "); _hexwrite(b1, 8); printf(", ");
@@ -580 +587 @@
   printf("b4: "); _hexwrite(b4, 8); printf(", ");
   printf("\n");*/
 
-  memcpy(b0c, b0, 8); memcpy(b1c, b1, 8);
-
-  const unsigned char *inpkts[] = {b3, b4, b2};
-  unsigned char *outpkts[] = {b0, b1};
-  unsigned indexes[] = {3, 4, 2};
-
   fec_decode(fec, inpkts, outpkts, indexes, 8);
 
   /*printf("after decoding:\n");