- markus@cvs.openbsd.org 2001/11/07 22:53:21

[openssh.git] / radix.c

diff --git a/radix.c b/radix.c
index 8429204848210789c63c67fa8dfc817172eab6d8..26b1ebe52f0c858fc4702fee053733ad7ac719ce 100644 (file)
--- a/radix.c
+++ b/radix.c
@@ -25,19 +25,21 @@
 #include "includes.h"
 #include "uuencode.h"
 
-RCSID("$OpenBSD: radix.c,v 1.13 2000/09/07 20:27:52 deraadt Exp $");
+RCSID("$OpenBSD: radix.c,v 1.16 2001/06/23 15:12:19 itojun Exp $");
 
 #ifdef AFS
 #include <krb.h>
 
-typedef unsigned char my_u_char;
-typedef unsigned int my_u_int32_t;
-typedef unsigned short my_u_short;
+#include <radix.h>
+
+typedef u_char my_u_char;
+typedef u_int my_u_int32_t;
+typedef u_short my_u_short;
 
 /* Nasty macros from BIND-4.9.2 */
 
 #define GETSHORT(s, cp) { \
-       register my_u_char *t_cp = (my_u_char*)(cp); \
+       register my_u_char *t_cp = (my_u_char *)(cp); \
        (s) = (((my_u_short)t_cp[0]) << 8) \
            | (((my_u_short)t_cp[1])) \
            ; \
@@ -45,7 +47,7 @@ typedef unsigned short my_u_short;
 }
 
 #define GETLONG(l, cp) { \
-       register my_u_char *t_cp = (my_u_char*)(cp); \
+       register my_u_char *t_cp = (my_u_char *)(cp); \
        (l) = (((my_u_int32_t)t_cp[0]) << 24) \
            | (((my_u_int32_t)t_cp[1]) << 16) \
            | (((my_u_int32_t)t_cp[2]) << 8) \
@@ -56,7 +58,7 @@ typedef unsigned short my_u_short;
 
 #define PUTSHORT(s, cp) { \
        register my_u_short t_s = (my_u_short)(s); \
-       register my_u_char *t_cp = (my_u_char*)(cp); \
+       register my_u_char *t_cp = (my_u_char *)(cp); \
        *t_cp++ = t_s >> 8; \
        *t_cp   = t_s; \
        (cp) += 2; \
@@ -64,7 +66,7 @@ typedef unsigned short my_u_short;
 
 #define PUTLONG(l, cp) { \
        register my_u_int32_t t_l = (my_u_int32_t)(l); \
-       register my_u_char *t_cp = (my_u_char*)(cp); \
+       register my_u_char *t_cp = (my_u_char *)(cp); \
        *t_cp++ = t_l >> 24; \
        *t_cp++ = t_l >> 16; \
        *t_cp++ = t_l >> 8; \
@@ -73,9 +75,9 @@ typedef unsigned short my_u_short;
 }
 
 #define GETSTRING(s, p, p_l) {                 \
-    register char* p_targ = (p) + p_l;         \
-    register char* s_c = (s);                  \
-    register char* p_c = (p);                  \
+    register char *p_targ = (p) + p_l;         \
+    register char *s_c = (s);                  \
+    register char *p_c = (p);                  \
     while (*p_c && (p_c < p_targ)) {           \
        *s_c++ = *p_c++;                        \
     }                                          \
@@ -89,7 +91,7 @@ typedef unsigned short my_u_short;
 
 
 int
-creds_to_radix(CREDENTIALS *creds, unsigned char *buf, size_t buflen)
+creds_to_radix(CREDENTIALS *creds, u_char *buf, size_t buflen)
 {
        char *p, *s;
        int len;
@@ -123,8 +125,8 @@ creds_to_radix(CREDENTIALS *creds, unsigned char *buf, size_t buflen)
 
        PUTLONG(creds->issue_date, p);
        {
-               unsigned int endTime;
-               endTime = (unsigned int) krb_life_to_time(creds->issue_date,
+               u_int endTime;
+               endTime = (u_int) krb_life_to_time(creds->issue_date,
                                                          creds->lifetime);
                PUTLONG(endTime, p);
        }
@@ -139,7 +141,7 @@ creds_to_radix(CREDENTIALS *creds, unsigned char *buf, size_t buflen)
        p += creds->ticket_st.length;
        len = p - temp;
 
-       return (uuencode((unsigned char *)temp, len, (char *)buf, buflen));
+       return (uuencode((u_char *)temp, len, (char *)buf, buflen));
 }
 
 int
@@ -151,7 +153,7 @@ radix_to_creds(const char *buf, CREDENTIALS *creds)
        char version;
        char temp[2048];
 
-       len = uudecode(buf, (unsigned char *)temp, sizeof(temp));
+       len = uudecode(buf, (u_char *)temp, sizeof(temp));
        if (len < 0)
                return 0;
 
@@ -184,7 +186,7 @@ radix_to_creds(const char *buf, CREDENTIALS *creds)
        GETLONG(creds->issue_date, p);
        len -= 4;
        {
-               unsigned int endTime;
+               u_int endTime;
                GETLONG(endTime, p);
                len -= 4;
                creds->lifetime = krb_time_to_life(creds->issue_date, endTime);