OSSP CVS Repository

ossp - Check-in [4950]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 4950
Date: 2005-Jan-13 09:36:27 (local)
2005-Jan-13 08:36:27 (UTC)
User:rse
Branch:
Comment: make gcc 4.0 happy
Tickets:
Inspections:
Files:
ossp-pkg/ui64/ui64.c      1.6 -> 1.7     1 inserted, 1 deleted
ossp-pkg/ui64/ui64_test.c      1.5 -> 1.6     2 inserted, 2 deleted

ossp-pkg/ui64/ui64.c 1.6 -> 1.7

--- ui64.c       2004/01/09 11:28:22     1.6
+++ ui64.c       2005/01/13 08:36:27     1.7
@@ -149,7 +149,7 @@
                 str[i++] = map[r];
                 while (n > 1 && x.x[n-1] == 0)
                         n--;
-        } while (i < (len-1) && (n > 1 || x.x[0] != 0));
+        } while (i < ((int)len-1) && (n > 1 || x.x[0] != 0));
         str[i] = '\0';
     for (j = 0; j < --i; j++) {
         c = str[j];


ossp-pkg/ui64/ui64_test.c 1.5 -> 1.6

--- ui64_test.c  2004/01/09 11:28:23     1.5
+++ ui64_test.c  2005/01/13 08:36:27     1.6
@@ -191,7 +191,7 @@
             case '-': re = ui64_sub(a1, a2, &ov); break;
             case '*': re = ui64_mul(a1, a2, &ov); break;
             case '/': re = ui64_div(a1, a2, &ov); break;
-            default: break;
+            default:  re = ui64_zero();           break;
         }
         re_s = ui64_i2s(re, re_a, sizeof(re_a), 10);
         ov_s = ui64_i2s(ov, ov_a, sizeof(ov_a), 10);
@@ -244,7 +244,7 @@
         switch (table[i].op[0]) {
             case '<': re = ui64_rol(a1, a2, &ov); break;
             case '>': re = ui64_ror(a1, a2, &ov); break;
-            default: break;
+            default:  re = ui64_zero();           break;
         }
         re_s = ui64_i2s(re, re_a, sizeof(re_a), 10);
         ov_s = ui64_i2s(ov, ov_a, sizeof(ov_a), 10);

CVSTrac 2.0.1