cleanup various warnings from gcc -Wall

git-svn-id: svn://svn.1ts.org/debian/branches/zephyr-reloaded@256 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/lib/ZCkAuth.c b/zephyr/lib/ZCkAuth.c
index 418335e187fe5eb876998550823d582422e89720..a85146364b4696c283cd3ba30932224b66f64efe 100644 (file)
--- a/zephyr/lib/ZCkAuth.c
+++ b/zephyr/lib/ZCkAuth.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZCheckAuthentication_c[] =
+static const char rcsid_ZCheckAuthentication_c[] =
     "$Zephyr: /mit/zephyr/src/lib/RCS/ZCheckAuthentication.c,v 1.14 89/03/24 14:17:38 jtkohl Exp Locker: raeburn $";
 #endif
 
@@ -63,6 +63,6 @@ ZCheckAuthentication(ZNotice_t *notice,
     /* if mismatched checksum, then the packet was corrupted */
     return ((our_checksum == notice->z_checksum) ? ZAUTH_YES : ZAUTH_FAILED);
 #else
-    ZCheckZcodeAuthentication(notice, from);
+    return ZCheckZcodeAuthentication(notice, from);
 #endif
 } 

diff --git a/zephyr/lib/ZCkZAut.c b/zephyr/lib/ZCkZAut.c
index 470e20d9dc0b9e413851dff01faa15a8184b3d16..a3d06f9a0aafb45e17bacce31087664cc0dfc731 100644 (file)
--- a/zephyr/lib/ZCkZAut.c
+++ b/zephyr/lib/ZCkZAut.c
@@ -13,7 +13,7 @@
 /* $Header$ */
 
 #ifndef lint
-static char rcsid_ZCheckAuthentication_c[] =
+static const char rcsid_ZCheckAuthentication_c[] =
     "$Zephyr: /mit/zephyr/src/lib/RCS/ZCheckAuthentication.c,v 1.14 89/03/24 14:17:38 jtkohl Exp Locker: raeburn $";
 #endif
 
@@ -54,8 +54,8 @@ Code_t ZCheckZcodeAuthentication(ZNotice_t *notice,
         krb5_data cksumbuf;
        int valid;
         char *cksum0_base, *cksum1_base, *cksum2_base;
-        char *svcinst, *x, *y;
-        char *asn1_data, *key_data;
+        char *x;
+        unsigned char *asn1_data, *key_data;
         int asn1_len, key_len, cksum0_len, cksum1_len, cksum2_len;
 
        result = ZGetCreds(&creds);
@@ -120,7 +120,7 @@ Code_t ZCheckZcodeAuthentication(ZNotice_t *notice,
 
             ZChecksum_t our_checksum;
 
-            our_checksum = des_quad_cksum(cksum0_base, NULL, cksum0_len, 0,
+            our_checksum = des_quad_cksum((unsigned char *)cksum0_base, NULL, cksum0_len, 0,
                                           key_data);
             if (our_checksum == notice->z_checksum) {
                 krb5_free_creds(Z_krb5_ctx, creds);
@@ -152,7 +152,7 @@ Code_t ZCheckZcodeAuthentication(ZNotice_t *notice,
             return ZAUTH_FAILED;
         }
         /* HOLDING: creds, asn1_data, cksumbuf.data */
-        result = ZReadZcode(notice->z_ascii_checksum,
+        result = ZReadZcode((unsigned char *)notice->z_ascii_checksum,
                             asn1_data, asn1_len, &asn1_len);
         if (result != ZERR_NONE) {
             krb5_free_creds(Z_krb5_ctx, creds);

diff --git a/zephyr/lib/ZCmpUID.c b/zephyr/lib/ZCmpUID.c
index 53ef45056679ea4f514368960279054eb928a508..a448deb11f2b554a98bf53242f578626e0eb3da5 100644 (file)
--- a/zephyr/lib/ZCmpUID.c
+++ b/zephyr/lib/ZCmpUID.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZCompareUID_c[] = "$Id$";
+static const char rcsid_ZCompareUID_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZCmpUIDP.c b/zephyr/lib/ZCmpUIDP.c
index 087fc33359cee32b63ecc16b3d07b65412bdfe59..abb05a40b5c1f680da2b3d0a9ff5a7d9fe8053f2 100644 (file)
--- a/zephyr/lib/ZCmpUIDP.c
+++ b/zephyr/lib/ZCmpUIDP.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZCompareUIDPred_c[] = "$Id$";
+static const char rcsid_ZCompareUIDPred_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZFlsLocs.c b/zephyr/lib/ZFlsLocs.c
index 0e533ae8717bd83d91e9925fb88e66c62ed72e55..3708b2472da1841bade6944245fd5b0546657018 100644 (file)
--- a/zephyr/lib/ZFlsLocs.c
+++ b/zephyr/lib/ZFlsLocs.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZFlushLocations_c[] = "$Id$";
+static const char rcsid_ZFlushLocations_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZFmtAuth.c b/zephyr/lib/ZFmtAuth.c
index 1e19f2f6c9e2c74f94751728ef5afb30da6c0ad4..ba647429d3a16948f15ad54bde6286e20f7a6a04 100644 (file)
--- a/zephyr/lib/ZFmtAuth.c
+++ b/zephyr/lib/ZFmtAuth.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZFormatAuthenticNotice_c[] = "$Id$";
+static const char rcsid_ZFormatAuthenticNotice_c[] = "$Id$";
 #endif
 
 #include <internal.h>
@@ -19,8 +19,8 @@ static char rcsid_ZFormatAuthenticNotice_c[] = "$Id$";
 #if defined(HAVE_KRB4) || defined(HAVE_KRB5)
 Code_t
 ZFormatAuthenticNotice(ZNotice_t *notice,
-                      register char *buffer,
-                      register int buffer_len,
+                      char *buffer,
+                      int buffer_len,
                       int *len,
                       C_Block session)
 {
@@ -41,7 +41,7 @@ ZFormatAuthenticNotice(ZNotice_t *notice,
     newnotice.z_checksum = 0;
 #else
     newnotice.z_checksum =
-       (ZChecksum_t)des_quad_cksum(buffer, NULL, ptr - buffer, 0, session);
+       (ZChecksum_t)des_quad_cksum((unsigned char *)buffer, NULL, ptr - buffer, 0, session);
 #endif
     if ((retval = Z_FormatRawHeader(&newnotice, buffer, buffer_len,
                                    &hdrlen, NULL, NULL)) != ZERR_NONE)
@@ -76,8 +76,6 @@ ZFormatAuthenticNoticeV5(ZNotice_t *notice,
     int retval, hdrlen, hdr_adj;
     krb5_enctype enctype;
     krb5_cksumtype cksumtype;
-    int valid;
-    char *svcinst, *x, *y;
     int key_len;
     char *cksum_start, *cstart, *cend;
     int cksum_len;

diff --git a/zephyr/lib/ZFmtNotice.c b/zephyr/lib/ZFmtNotice.c
index f0ad059867cd58d37d82dfabc04e160aa26e15b3..0f914f31c686003b3b85066885ad2175936357bd 100644 (file)
--- a/zephyr/lib/ZFmtNotice.c
+++ b/zephyr/lib/ZFmtNotice.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZFormatNotice_c[] = "$Id$";
+static const char rcsid_ZFormatNotice_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZFmtRaw.c b/zephyr/lib/ZFmtRaw.c
index c56d747fbc5831830e9cc4ea372c6c8ea92608ad..691ded0fca1816af75813103a26cb4d963ef50ff 100644 (file)
--- a/zephyr/lib/ZFmtRaw.c
+++ b/zephyr/lib/ZFmtRaw.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZFormatRawNotice_c[] = "$Id$";
+static const char rcsid_ZFormatRawNotice_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZFmtRawLst.c b/zephyr/lib/ZFmtRawLst.c
index 470b01f769a7f27c938bd6b2dd7a078d74546869..f08040ebe50424be1bca807f39a1cd776b6e6dc7 100644 (file)
--- a/zephyr/lib/ZFmtRawLst.c
+++ b/zephyr/lib/ZFmtRawLst.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZFormatRawNoticeList_c[] = "$Id$";
+static const char rcsid_ZFormatRawNoticeList_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZFmtSmRLst.c b/zephyr/lib/ZFmtSmRLst.c
index cc5177afc599c880f6c2570a659e500696e48ede..6b60097c7f59ad6496afeb2ddb17aebbbd49248a 100644 (file)
--- a/zephyr/lib/ZFmtSmRLst.c
+++ b/zephyr/lib/ZFmtSmRLst.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZFormatRawNoticeList_c[] = "$Id$";
+static const char rcsid_ZFormatRawNoticeList_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZFmtSmRaw.c b/zephyr/lib/ZFmtSmRaw.c
index 3f23d62ba4a12da0993413b21777fed084c964bd..3de04ad8ce47b3b2002c637ff975b2184bcecac0 100644 (file)
--- a/zephyr/lib/ZFmtSmRaw.c
+++ b/zephyr/lib/ZFmtSmRaw.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZFormatRawNotice_c[] = "$Id$";
+static const char rcsid_ZFormatRawNotice_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZFreeNot.c b/zephyr/lib/ZFreeNot.c
index 355d0e3e03b9b8744222758c0481e33471318dd6..663dbf8fbc5b3a1ced1232af935fd95e82c92c6d 100644 (file)
--- a/zephyr/lib/ZFreeNot.c
+++ b/zephyr/lib/ZFreeNot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZFreeNotice_c[] = "$Id$";
+static const char rcsid_ZFreeNotice_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZGetLocs.c b/zephyr/lib/ZGetLocs.c
index cbc07fb022d73c83b216c3881bb6f71c6b48de21..1c018da5904c3eafb946fc7418974dc156151566 100644 (file)
--- a/zephyr/lib/ZGetLocs.c
+++ b/zephyr/lib/ZGetLocs.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZGetLocations_c[] = "$Id$";
+static const char rcsid_ZGetLocations_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZGetSender.c b/zephyr/lib/ZGetSender.c
index 09ca742237ff1dfd637112ed5bede79cf39716a5..953d4f909670142edbfa6a5bb6809f170ff6e307 100644 (file)
--- a/zephyr/lib/ZGetSender.c
+++ b/zephyr/lib/ZGetSender.c
@@ -29,7 +29,6 @@ ZGetSender(void)
     krb5_principal principal;
     char *prname;
     int result;
-    char pname[ANAME_SZ], pinst[INST_SZ], prealm[REALM_SZ]; /*XXX*/
 #else    
 #ifdef HAVE_KRB4
     char pname[ANAME_SZ], pinst[INST_SZ], prealm[REALM_SZ];

diff --git a/zephyr/lib/ZGetSubs.c b/zephyr/lib/ZGetSubs.c
index a76226228a0fd79e85abdc9e561b2eb7adce9658..465461a91886675212d7d2ad2b5549a7ac95ea59 100644 (file)
--- a/zephyr/lib/ZGetSubs.c
+++ b/zephyr/lib/ZGetSubs.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZGetSubscriptions_c[] = "$Id$";
+static const char rcsid_ZGetSubscriptions_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZGetWGPort.c b/zephyr/lib/ZGetWGPort.c
index ad3b483a539e738e66ecd7744b8bffa5908bcc8a..b3ef17ceb40c40e5ea563e46861894fc150407bf 100644 (file)
--- a/zephyr/lib/ZGetWGPort.c
+++ b/zephyr/lib/ZGetWGPort.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZGetWGPort_c[] = "$Id$";
+static const char rcsid_ZGetWGPort_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZInit.c b/zephyr/lib/ZInit.c
index d14543ca3e3321c833571a994749a2d133f8fdb2..8b26f8aa8c4c222e0ad6adbb2aba003c648d3857 100644 (file)
--- a/zephyr/lib/ZInit.c
+++ b/zephyr/lib/ZInit.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZInitialize_c[] =
+static const char rcsid_ZInitialize_c[] =
     "$Zephyr: /afs/athena.mit.edu/astaff/project/zephyr/src/lib/RCS/ZInitialize.c,v 1.17 89/05/30 18:11:25 jtkohl Exp $";
 #endif
 
@@ -40,7 +40,7 @@ ZInitialize(void)
     char addr[4], hostname[MAXHOSTNAMELEN];
     struct in_addr servaddr;
     struct sockaddr_in sin;
-    int s, sinsize = sizeof(sin);
+    unsigned int s, sinsize = sizeof(sin);
     Code_t code;
     ZNotice_t notice;
 #ifdef HAVE_KRB5

diff --git a/zephyr/lib/ZLocations.c b/zephyr/lib/ZLocations.c
index 9b580bcb7ed1bbd360a8b8a051f1c2abdb018f1a..e721a9c00e3c0f044cf736c4a2adec392f8a96e6 100644 (file)
--- a/zephyr/lib/ZLocations.c
+++ b/zephyr/lib/ZLocations.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZLocations_c[] =
+static const char rcsid_ZLocations_c[] =
     "$Zephyr: /afs/athena.mit.edu/astaff/project/zephyr/src/lib/RCS/ZLocations.c,v 1.30 90/12/20 03:04:39 raeburn Exp $";
 #endif
 
@@ -105,7 +105,6 @@ Z_SendLocation(char *class,
     time_t ourtime;
     ZNotice_t notice, retnotice;
     char *bptr[3];
-    struct hostent *hent;
     short wg_port = ZGetWGPort();
 
     if (!location_info_set)

diff --git a/zephyr/lib/ZMkAuth.c b/zephyr/lib/ZMkAuth.c
index 7ed6d61cef553a6b5dd19f4f7a2292ade864e32e..121f81306b5ec50727921784f110024046b7d42f 100644 (file)
--- a/zephyr/lib/ZMkAuth.c
+++ b/zephyr/lib/ZMkAuth.c
@@ -7,7 +7,7 @@
  *
  *     Copyright (c) 1987 by the Massachusetts Institute of Technology.
  *     For copying and distribution information, see the file
- *     "mit-copyright.h". 
+ *     "mit-copyright.h".
  */
 
 #include <internal.h>
@@ -48,7 +48,7 @@ ZMakeAuthentication(register ZNotice_t *notice,
     CREDENTIALS cred;
     C_Block *session;
 
-    result = krb_mk_req(&authent, SERVER_SERVICE, 
+    result = krb_mk_req(&authent, SERVER_SERVICE,
                        SERVER_INSTANCE, __Zephyr_realm, 0);
     if (result != MK_AP_OK)
        return (result+krb_err_base);
@@ -65,9 +65,9 @@ ZMakeAuthentication(register ZNotice_t *notice,
     /* zero length authent is an error, so malloc(0) is not a problem */
     if (!notice->z_ascii_authent)
        return (ENOMEM);
-    if ((result = ZMakeAscii(notice->z_ascii_authent, 
-                            authent.length*3, 
-                            authent.dat, 
+    if ((result = ZMakeAscii(notice->z_ascii_authent,
+                            authent.length*3,
+                            authent.dat,
                             authent.length)) != ZERR_NONE) {
        free(notice->z_ascii_authent);
        return (result);
@@ -113,37 +113,34 @@ Code_t
 ZMakeZcodeRealmAuthentication(register ZNotice_t *notice,
                              char *buffer,
                              int buffer_len,
-                             int *phdr_len, 
+                             int *phdr_len,
                              char *realm)
 {
 #ifdef HAVE_KRB5
     krb5_error_code result;
     krb5_creds *creds;
     krb5_keyblock *keyblock;
-    krb5_enctype enctype;
-    krb5_cksumtype cksumtype;
     krb5_auth_context authctx;
     krb5_data *authent;
-    char *svcinst, *x, *y;
-    char *cksum_start, *cstart, *cend, *asn1_data;
-    int i, cksum_len, zcode_len, asn1_len, phdr_adj;
-    
+    char *cksum_start, *cstart, *cend;
+    int cksum_len, zcode_len, phdr_adj;
+
     result = ZGetCredsRealm(&creds, realm);
     if (result)
        return result;
     /* HOLDING: creds */
-    
+
     /* Figure out what checksum type to use */
     keyblock = Z_credskey(creds);
     /* HOLDING: creds */
-    
+
     /* Create the authenticator */
     result = krb5_auth_con_init(Z_krb5_ctx, &authctx);
     if (result) {
        krb5_free_creds(Z_krb5_ctx, creds);
        return (result);
     }
-       
+
     authent = (krb5_data *)malloc(sizeof(krb5_data));
 
     /* HOLDING: creds, authctx */
@@ -155,7 +152,7 @@ ZMakeZcodeRealmAuthentication(register ZNotice_t *notice,
        return (result);
     }
     /* HOLDING: creds, authent */
-    
+
     /* Encode the authenticator */
     notice->z_auth = 1;
     notice->z_authent_len = authent->length;
@@ -167,8 +164,8 @@ ZMakeZcodeRealmAuthentication(register ZNotice_t *notice,
        return (ENOMEM);
     }
     /* HOLDING: creds, authent, notice->z_ascii_authent */
-    result = ZMakeZcode(notice->z_ascii_authent, zcode_len, 
-                       authent->data, authent->length);
+    result = ZMakeZcode(notice->z_ascii_authent, zcode_len,
+                       (unsigned char *)authent->data, authent->length);
     krb5_free_data(Z_krb5_ctx, authent);
     if (result) {
        free(notice->z_ascii_authent);
@@ -176,7 +173,7 @@ ZMakeZcodeRealmAuthentication(register ZNotice_t *notice,
        return (result);
     }
     /* HOLDING: creds, notice->z_ascii_authent */
-    
+
     /* format the notice header, with a zero checksum */
     result = Z_NewFormatRawHeader(notice, buffer, buffer_len, phdr_len,
                                  &cksum_start, &cksum_len, &cstart, &cend);
@@ -213,7 +210,7 @@ ZGetCredsRealm(krb5_creds **creds_out,
   krb5_creds creds_in;
   krb5_ccache ccache; /* XXX make this a global or static?*/
   int result;
-  
+
   result = krb5_cc_default(Z_krb5_ctx, &ccache);
   if (result)
     return result;
@@ -227,20 +224,20 @@ ZGetCredsRealm(krb5_creds **creds_out,
     krb5_cc_close(Z_krb5_ctx, ccache);
     return result;
   }
-  
+
   result = krb5_cc_get_principal(Z_krb5_ctx, ccache, &creds_in.client);
   if (result) {
     krb5_free_cred_contents(Z_krb5_ctx, &creds_in); /* I also hope this is ok */
     krb5_cc_close(Z_krb5_ctx, ccache);
     return result;
   }
- 
-#ifdef HAVE_KRB5_CREDS_KEYBLOCK_ENCTYPE 
+
+#ifdef HAVE_KRB5_CREDS_KEYBLOCK_ENCTYPE
   creds_in.keyblock.enctype = ENCTYPE_DES_CBC_CRC; /* XXX? */
 #else
   creds_in.session.keytype = KEYTYPE_DES; /* XXX? */
 #endif
-  
+
   result = krb5_get_credentials(Z_krb5_ctx, 0, ccache, &creds_in, creds_out);
   krb5_cc_close(Z_krb5_ctx, ccache);
   krb5_free_cred_contents(Z_krb5_ctx, &creds_in); /* I also hope this is ok */

diff --git a/zephyr/lib/ZOpenPort.c b/zephyr/lib/ZOpenPort.c
index 44bf871496587591e9a77751813d6f7df713f533..3116e9b0f1aec1f5fe3d66a942f435b8355a67d3 100644 (file)
--- a/zephyr/lib/ZOpenPort.c
+++ b/zephyr/lib/ZOpenPort.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZOpenPort_c[] = "$Id$";
+static const char rcsid_ZOpenPort_c[] = "$Id$";
 #endif
 
 #include <internal.h>
@@ -21,7 +21,7 @@ Code_t
 ZOpenPort(u_short *port)
 {
     struct sockaddr_in bindin;
-    int len;
+    unsigned int len;
     
     (void) ZClosePort();
 

diff --git a/zephyr/lib/ZParseNot.c b/zephyr/lib/ZParseNot.c
index 7202c472361b795c7d6af15f8f256f336b5bd840..72a75872db7ee27396ae0d205460287271d4ad62 100644 (file)
--- a/zephyr/lib/ZParseNot.c
+++ b/zephyr/lib/ZParseNot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZParseNotice_c[] =
+static const char rcsid_ZParseNotice_c[] =
     "$Zephyr: /mit/zephyr/src/lib/RCS/ZParseNotice.c,v 1.22 91/03/29 03:34:46 raeburn Exp $";
 #endif
 

diff --git a/zephyr/lib/ZPeekIfNot.c b/zephyr/lib/ZPeekIfNot.c
index bd643f8f5bcc81b8a383fc62f119a74a3d363cae..3bc3e90485a570dd0acf75be51488bf6dc4aed24 100644 (file)
--- a/zephyr/lib/ZPeekIfNot.c
+++ b/zephyr/lib/ZPeekIfNot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZPeekIfNotice_c[] = "$Id$";
+static const char rcsid_ZPeekIfNotice_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZPeekNot.c b/zephyr/lib/ZPeekNot.c
index 679382e7e35b933c456577e79ed3204df68e3a2d..18c2026e2f62452e1170a232d15f16b3e1630620 100644 (file)
--- a/zephyr/lib/ZPeekNot.c
+++ b/zephyr/lib/ZPeekNot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZPeekNotice_c[] = "$Id$";
+static const char rcsid_ZPeekNotice_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZPeekPkt.c b/zephyr/lib/ZPeekPkt.c
index 6b89f9ea57fb9332e35440ed0bf608142f7adc5a..53c5dd7834f569383f3fc2224ac46e9047c2e8b3 100644 (file)
--- a/zephyr/lib/ZPeekPkt.c
+++ b/zephyr/lib/ZPeekPkt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZPeekPacket_c[] = "$Id$";
+static const char rcsid_ZPeekPacket_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZPending.c b/zephyr/lib/ZPending.c
index b6cd5374f66f2182d4a5b2d97ea3cd87bf4e44e0..6053c6971455ad3d415ec0d8419ee6032184a558 100644 (file)
--- a/zephyr/lib/ZPending.c
+++ b/zephyr/lib/ZPending.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZPending_c[] = "$Id$";
+static const char rcsid_ZPending_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZReadAscii.c b/zephyr/lib/ZReadAscii.c
index a0bd395d54edc6e4f96da2bc3bc0713b8a07e89a..49aaa5866a2bf35a17488de465a6324e8d57a7a5 100644 (file)
--- a/zephyr/lib/ZReadAscii.c
+++ b/zephyr/lib/ZReadAscii.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZReadAscii_c[] = "$Id$";
+static const char rcsid_ZReadAscii_c[] = "$Id$";
 #endif /* lint */
 
 #include <internal.h>

diff --git a/zephyr/lib/ZReadZcode.c b/zephyr/lib/ZReadZcode.c
index c9fc2f1d4aae6c819eac7886f8f98efcf3db2d7c..dc9799000cae68d8468d8c79be3bf5a5615eee9f 100644 (file)
--- a/zephyr/lib/ZReadZcode.c
+++ b/zephyr/lib/ZReadZcode.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZReadZcode_c[] = "$Id$";
+static const char rcsid_ZReadZcode_c[] = "$Id$";
 #endif /* lint */
 
 #include <internal.h>

diff --git a/zephyr/lib/ZRecvNot.c b/zephyr/lib/ZRecvNot.c
index b6bc4427c95eca036a453877c11cd865c655fdb6..fbb288af4d0846136a996fc40bc10e16c87812c6 100644 (file)
--- a/zephyr/lib/ZRecvNot.c
+++ b/zephyr/lib/ZRecvNot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZReceiveNotice_c[] = "$Id$";
+static const char rcsid_ZReceiveNotice_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZRecvPkt.c b/zephyr/lib/ZRecvPkt.c
index 467268e7611268617e35f31e8311d3fa1333144a..3f36ddcb8373ec1e15a8e3fde0f4cb8a8e74c4aa 100644 (file)
--- a/zephyr/lib/ZRecvPkt.c
+++ b/zephyr/lib/ZRecvPkt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZReceivePacket_c[] = "$Id$";
+static const char rcsid_ZReceivePacket_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZSendList.c b/zephyr/lib/ZSendList.c
index 27176fa8dbeefaa52e17aa5248cf5fa50311b79e..e5d9baa4dbd11c7ec40ac3e76e174dfeb688eca9 100644 (file)
--- a/zephyr/lib/ZSendList.c
+++ b/zephyr/lib/ZSendList.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZSendList_c[] = "$Id$";
+static const char rcsid_ZSendList_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZSendNot.c b/zephyr/lib/ZSendNot.c
index 9f59fd3dae9b78b68259e4bb4d9f5174de3ecf6c..be23d5ad1d5c194f87ba81aa7f2e93b41df24e14 100644 (file)
--- a/zephyr/lib/ZSendNot.c
+++ b/zephyr/lib/ZSendNot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZSendNotice_c[] = "$Id$";
+static const char rcsid_ZSendNotice_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZSendPkt.c b/zephyr/lib/ZSendPkt.c
index e542c79f19bb37533bf0c168428dc6348201c766..ef1eb6bc62b9afdf213114f5282ec1aef6e9215a 100644 (file)
--- a/zephyr/lib/ZSendPkt.c
+++ b/zephyr/lib/ZSendPkt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZSendPacket_c[] =
+static const char rcsid_ZSendPacket_c[] =
     "$Zephyr: /mit/zephyr/src/lib/RCS/ZSendPacket.c,v 1.29 91/03/21 11:57:08 raeburn Exp $";
 #endif
 

diff --git a/zephyr/lib/ZSendRLst.c b/zephyr/lib/ZSendRLst.c
index d4d6b7dde6646958de85e628c492c46aca86a971..3cb4c636f03d98622abc436265ba1a8a7742b24f 100644 (file)
--- a/zephyr/lib/ZSendRLst.c
+++ b/zephyr/lib/ZSendRLst.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZSendRawList_c[] = "$Id$";
+static const char rcsid_ZSendRawList_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZSendRaw.c b/zephyr/lib/ZSendRaw.c
index 1cd0438fd768223e40c5f481c2734a20ea9f19e2..b4eadc35924024aeafc012fba2fb7d3e2b80e2f8 100644 (file)
--- a/zephyr/lib/ZSendRaw.c
+++ b/zephyr/lib/ZSendRaw.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZSendRawNotice_c[] = "$Id$";
+static const char rcsid_ZSendRawNotice_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZSetDest.c b/zephyr/lib/ZSetDest.c
index 23f75de6e308b4cba475c78f6abd1511bcd65563..4869fbfde1d9c2ae9be477a2c2ba3842ac48ad16 100644 (file)
--- a/zephyr/lib/ZSetDest.c
+++ b/zephyr/lib/ZSetDest.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZSetDestAddr_c[] = "$Id$";
+static const char rcsid_ZSetDestAddr_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZSetFD.c b/zephyr/lib/ZSetFD.c
index be16f659be68b6ad2a76f42d615853a53c4b2b79..b0f3df71ad5b8ac3db224ebc66a7a8dde0c01a8e 100644 (file)
--- a/zephyr/lib/ZSetFD.c
+++ b/zephyr/lib/ZSetFD.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZSetFD_c[] = "$Id$";
+static const char rcsid_ZSetFD_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZSetSrv.c b/zephyr/lib/ZSetSrv.c
index 8b273e14d957a7dc63e2d371f1e15a42673d67d4..a3c67c0bcae0667a3e11c010d5f69e52490a5bd9 100644 (file)
--- a/zephyr/lib/ZSetSrv.c
+++ b/zephyr/lib/ZSetSrv.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZSetServerState_c[] = "$Id$";
+static const char rcsid_ZSetServerState_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZVariables.c b/zephyr/lib/ZVariables.c
index 56e13da6792ce5ec5d2c83ea95662f3a6ed01f42..6f0aec9e8d703d5e1e14ebc390acbcc8fb2f2b3f 100644 (file)
--- a/zephyr/lib/ZVariables.c
+++ b/zephyr/lib/ZVariables.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid_ZVariables_c[] = "$Id$";
+static const char rcsid_ZVariables_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/ZWait4Not.c b/zephyr/lib/ZWait4Not.c
index c30dd065d50b81d8384526f53db9b140d044c139..d6c54096576de467508c875ef2001f1a66a04868 100644 (file)
--- a/zephyr/lib/ZWait4Not.c
+++ b/zephyr/lib/ZWait4Not.c
@@ -14,7 +14,7 @@
 #include "mit-copyright.h"
 
 #ifndef lint
-static char rcsid_ZWaitForNotice_c[] = "$Id$";
+static const char rcsid_ZWaitForNotice_c[] = "$Id$";
 #endif
 
 #include <internal.h>

diff --git a/zephyr/lib/Zinternal.c b/zephyr/lib/Zinternal.c
index d3958b545e978d4ccecc2803b6fd995d79d86d40..7b4b1c0ca0d23764d67670749964d6f19bf13e62 100644 (file)
--- a/zephyr/lib/Zinternal.c
+++ b/zephyr/lib/Zinternal.c
@@ -280,7 +280,8 @@ Z_ReadWait(void)
     ZNotice_t notice;
     ZPacket_t packet;
     struct sockaddr_in olddest, from;
-    int from_len, packet_len, zvlen, part, partof;
+    unsigned int from_len;
+    int packet_len, zvlen, part, partof;
     char *slash;
     Code_t retval;
     fd_set fds;
@@ -657,7 +658,7 @@ Z_FormatHeader(ZNotice_t *notice,
     Code_t retval;
     static char version[BUFSIZ]; /* default init should be all \0 */
     struct sockaddr_in name;
-    int namelen = sizeof(name);
+    unsigned int namelen = sizeof(name);
 
     if (!notice->z_sender)
        notice->z_sender = ZGetSender();
@@ -703,7 +704,7 @@ Z_NewFormatHeader(ZNotice_t *notice,
     static char version[BUFSIZ]; /* default init should be all \0 */
     struct sockaddr_in name;
     struct timeval tv;
-    int namelen = sizeof(name);
+    unsigned int namelen = sizeof(name);
 
     if (!notice->z_sender)
        notice->z_sender = ZGetSender();
@@ -1278,10 +1279,10 @@ Z_Checksum(krb5_data *cksumbuf,
           krb5_keyblock *keyblock, 
           krb5_cksumtype cksumtype, 
           char **asn1_data,
-          int *asn1_len)
+          unsigned int *asn1_len)
 {
     krb5_error_code result;
-    char *data;
+    unsigned char *data;
     int len;
 #if HAVE_KRB5_C_MAKE_CHECKSUM
     krb5_checksum checksum;
@@ -1353,7 +1354,7 @@ Z_InsertZcodeChecksum(krb5_keyblock *keyblock,
      int cksum1_len;  /* length of part after checksum */
      krb5_data cksumbuf;
      krb5_data cksum;
-     char *key_data;
+     unsigned char *key_data;
      int key_len;
      krb5_enctype enctype;
      krb5_cksumtype cksumtype;
@@ -1394,7 +1395,7 @@ Z_InsertZcodeChecksum(krb5_keyblock *keyblock,
       */
      
      result = ZMakeZcode(cstart, buffer_len - (plain_len + cksum_len),
-                         cksum.data, cksum.length);
+                         (unsigned char *)cksum.data, cksum.length);
      free(cksum.data);
      if (!result) {
           int zcode_len = strlen(cstart) + 1;
@@ -1421,7 +1422,7 @@ int
 Z_krb5_verify_cksum(krb5_keyblock *keyblock,
                    krb5_data *cksumbuf, 
                     krb5_cksumtype cksumtype,
-                   char *asn1_data, 
+                   unsigned char *asn1_data, 
                     int asn1_len)
 {
     krb5_error_code result;