use-afs-int64-types-in-util-package-20010327

we already defined "portable" types for this; use them

diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index 4430693..dcc58a8 100644 (file)
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -112,9 +112,9 @@ int base32_to_int(char *s);
  * early in name.
  */
 typedef char lb64_string_t[12];
-char *int64_to_flipbase64(b64_string_t s, uint64_t a);
+char *int64_to_flipbase64(b64_string_t s, afs_int64 a);
 int64_t flipbase64_to_int64(char *s);
-#define int32_to_flipbase64(S, A) int64_to_flipbase64(S, (uint64_t)(A))
+#define int32_to_flipbase64(S, A) int64_to_flipbase64(S, (afs_int64)(A))
 #endif
 
 /* This message preserves our ability to license AFS to the U.S. Government

diff --git a/src/util/flipbase64.c b/src/util/flipbase64.c
index ba6ef91..69ed97b 100644 (file)
--- a/src/util/flipbase64.c
+++ b/src/util/flipbase64.c
@@ -27,10 +27,10 @@ static char c_xlate[80] =
  * The supplied string 's' must be at least 12 bytes long.
  * lb64_string in stds.h provides a typedef to get the length.
  */
-char *int64_to_flipbase64(lb64_string_t s, uint64_t a)
+char *int64_to_flipbase64(lb64_string_t s, afs_int64 a)
 {
     int i, j;
-    int64_t n;
+    afs_int64 n;
 
     i = 0;
     if (a==0)
@@ -48,8 +48,8 @@ char *int64_to_flipbase64(lb64_string_t s, uint64_t a)
 /* Mapping: +=0, ==1, 0-9 = 2-11, A-Z = 12-37, a-z = 38-63 */
 int64_t flipbase64_to_int64(char *s)
 {
-    int64_t n = 0;
-    int64_t result = 0;
+    afs_int64 n = 0;
+    afs_int64 result = 0;
     int shift;
 
     for (shift = 0; *s; s++, shift += 6) {