Avoid warnings.

diff --git a/nis/nis_call.c b/nis/nis_call.c
index f0efc7e..cd1b617 100644 (file)
--- a/nis/nis_call.c
+++ b/nis/nis_call.c
@@ -32,13 +32,14 @@ static int const MAXTRIES = 3;
 static unsigned long
 inetstr2int (const char *str)
 {
-  char buffer[strlen(str)+3];
-  int i, j;
+  char buffer[strlen (str) + 3];
+  size_t buflen;
+  size_t i, j;
 
-  strcpy (buffer, str);
+  buflen = stpcpy (buffer, str) - buffer;
 
   j = 0;
-  for (i = 0; i < strlen (buffer); ++i)
+  for (i = 0; i < buflen; ++i)
     if (buffer[i] == '.')
       {
        ++j;
@@ -49,16 +50,18 @@ inetstr2int (const char *str)
          }
       }
 
-  return inet_addr(buffer);
+  return inet_addr (buffer);
 }
 
 static CLIENT *
 __nis_dobind (const nis_server *server, u_long flags)
 {
   struct sockaddr_in clnt_saddr;
-  int clnt_sock, i;
+  int clnt_sock;
+  size_t i;
   CLIENT *client = NULL;
-  void *out;
+  /* XXX What is this variable for?  */
+  void *out = NULL;
 
   for (i = 0; i < server->ep.ep_len; i++)
     {
@@ -90,13 +93,13 @@ __nis_dobind (const nis_server *server, u_long flags)
          {
            if (server->ep.ep_val[i].uaddr[i] == '-')
              clnt_saddr.sin_addr.s_addr =
-               inetstr2int(server->ep.ep_val[i].uaddr);
+               inetstr2int (server->ep.ep_val[i].uaddr);
            else
              if (strcmp (server->ep.ep_val[i].proto,"udp") == 0)
                {
                  if ((flags & USE_DGRAM) == USE_DGRAM)
                    clnt_saddr.sin_addr.s_addr =
-                     inetstr2int(server->ep.ep_val[i].uaddr);
+                     inetstr2int (server->ep.ep_val[i].uaddr);
                  else
                    continue;
                }
@@ -107,7 +110,7 @@ __nis_dobind (const nis_server *server, u_long flags)
                      continue;
                    else
                      clnt_saddr.sin_addr.s_addr =
-                       inetstr2int(server->ep.ep_val[i].uaddr);
+                       inetstr2int (server->ep.ep_val[i].uaddr);
                  }
          }
        else
@@ -139,19 +142,19 @@ __nis_dobind (const nis_server *server, u_long flags)
                char netname[MAXNETNAMELEN+1];
                char *p;
 
-               strcpy(netname,"unix.");
-               strncat(netname,server->name,MAXNETNAMELEN-5);
+               strcpy (netname, "unix.");
+               strncat (netname, server->name,MAXNETNAMELEN-5);
                netname[MAXNETNAMELEN-5] = '\0';
-               p = strchr(netname,'.');
+               p = strchr (netname, '.');
                *p = '@';
                client->cl_auth =
-                 authdes_pk_create(netname, &server->pkey, 300, NULL, NULL);
+                 authdes_pk_create (netname, &server->pkey, 300, NULL, NULL);
                if (!client->cl_auth)
-                 client->cl_auth = authunix_create_default();
+                 client->cl_auth = authunix_create_default ();
              }
            else
 #endif
-             client->cl_auth = authunix_create_default();
+             client->cl_auth = authunix_create_default ();
          }
       return client;
     }
@@ -166,7 +169,7 @@ __do_niscall (const nis_server *serv, int serv_len, u_long prog,
 {
   CLIENT *clnt;
   directory_obj *dir = NULL;
-  nis_server *server;
+  const nis_server *server;
   int try, result, server_len;
 
   if (serv == NULL || serv_len == 0)
@@ -200,7 +203,9 @@ __do_niscall (const nis_server *serv, int serv_len, u_long prog,
 
          if (result != RPC_SUCCESS)
            {
-             clnt_perror (clnt, "do_niscall: clnt_call");
+             /* XXX Grrr.  The cast is needed for now since Sun code does
+                note know about `const'.  */
+             clnt_perror (clnt, (char *) "do_niscall: clnt_call");
              clnt_destroy (clnt);
              result = NIS_RPCERROR;
            }

diff --git a/nis/nis_clone.c b/nis/nis_clone.c
index c2d85fc..860abb3 100644 (file)
--- a/nis/nis_clone.c
+++ b/nis/nis_clone.c
@@ -45,7 +45,7 @@ nis_clone_directory (const directory_obj *src, directory_obj *dest)
   res->do_type = src->do_type;
   if (src->do_servers.do_servers_len > 0)
     {
-      int i;
+      size_t i;
 
       res->do_servers.do_servers_len = src->do_servers.do_servers_len;
       if ((res->do_servers.do_servers_val =
@@ -65,7 +65,7 @@ nis_clone_directory (const directory_obj *src, directory_obj *dest)
            src->do_servers.do_servers_val[i].ep.ep_len;
          if (res->do_servers.do_servers_val[i].ep.ep_len > 0)
            {
-             int j;
+             size_t j;
 
              res->do_servers.do_servers_val[i].ep.ep_val =
                malloc (src->do_servers.do_servers_val[i].ep.ep_len *
@@ -139,7 +139,7 @@ nis_clone_directory (const directory_obj *src, directory_obj *dest)
 group_obj *
 nis_clone_group (const group_obj *src, group_obj *dest)
 {
-  int i;
+  size_t i;
   group_obj *res = NULL;
 
   if (src == NULL)
@@ -180,7 +180,7 @@ nis_clone_group (const group_obj *src, group_obj *dest)
 table_obj *
 nis_clone_table (const table_obj *src, table_obj *dest)
 {
-  int i;
+  size_t i;
   table_obj *res = NULL;
 
   if (src == NULL)
@@ -240,7 +240,7 @@ nis_clone_table (const table_obj *src, table_obj *dest)
 entry_obj *
 nis_clone_entry (const entry_obj *src, entry_obj *dest)
 {
-  int i;
+  size_t i;
   entry_obj *res = NULL;
 
   if (src == NULL)

diff --git a/nis/nis_error.c b/nis/nis_error.c
index d3e1bce..760dc51 100644 (file)
--- a/nis/nis_error.c
+++ b/nis/nis_error.c
@@ -75,11 +75,11 @@ static const char *nis_errlist[] =
   N_("Master server busy, full dump rescheduled.")
 };
 
-char *
+const char *
 nis_sperrno (const nis_error status)
 {
   if (status >= (sizeof (nis_errlist) / sizeof (nis_errlist[0])))
-    return "?";
+    return "???";
   else
     return gettext (nis_errlist[status]);
 }
@@ -100,7 +100,7 @@ char *
 nis_sperror_r (const nis_error status, const char *label,
               char *buffer, size_t buflen)
 {
-  char *cptr;
+  const char *cptr;
 
   cptr = nis_sperrno (status);
 
@@ -110,7 +110,7 @@ nis_sperror_r (const nis_error status, const char *label,
       return NULL;
     }
 
-    sprintf(buffer, "%s: %s", label, cptr);
+    sprintf (buffer, "%s: %s", label, cptr);
 
     return buffer;
 }

diff --git a/nis/nis_file.c b/nis/nis_file.c
index 0bc32a7..002e72e 100644 (file)
--- a/nis/nis_file.c
+++ b/nis/nis_file.c
@@ -58,7 +58,9 @@ writeColdStartFile (const directory_obj *obj)
     return FALSE;
 
   xdrstdio_create (&xdrs, out, XDR_ENCODE);
-  if (!xdr_directory_obj (&xdrs, obj))
+  /* XXX The following cast is bad!  Shouldn't the XDR functions take
+     pointers to const objects?  */
+  if (!xdr_directory_obj (&xdrs, (directory_obj *) obj))
     {
       fputs (_("Error while reading /var/nis/NIS_COLD_START!\n"), stdout);
       return FALSE;
@@ -97,7 +99,9 @@ nis_write_obj (const char *name, const nis_object *obj)
     return FALSE;
 
   xdrstdio_create (&xdrs, out, XDR_ENCODE);
-  if (!xdr_nis_object (&xdrs, obj))
+  /* XXX The following cast is bad!  Shouldn't the XDR functions take
+     pointers to const objects?  */
+  if (!xdr_nis_object (&xdrs, (nis_object *) obj))
     return FALSE;
 
   return TRUE;

diff --git a/nis/nis_free.c b/nis/nis_free.c
index c666e3f..35b7331 100644 (file)
--- a/nis/nis_free.c
+++ b/nis/nis_free.c
@@ -69,7 +69,7 @@ nis_free_request (ib_request *ibreq)
 void
 nis_free_endpoints (endpoint *ep, int len)
 {
-  unsigned int i;
+  int i;
 
   if (ep == NULL)
     return;
@@ -97,7 +97,7 @@ nis_free_endpoints (endpoint *ep, int len)
 void
 nis_free_servers (nis_server *obj, int len)
 {
-  unsigned int i;
+  int i;
 
   if (obj == NULL)
     return;

diff --git a/nis/nis_intern.c b/nis/nis_intern.c
index a7e9512..57019b3 100644 (file)
--- a/nis/nis_intern.c
+++ b/nis/nis_intern.c
@@ -114,7 +114,7 @@ __nis_expandname (const nis_name name)
              tmp = stpcpy (tmp, cp);
              --tmp;
              if (tmp[- 1] != '.')
-               *tmp++ = '.'
+               *tmp++ = '.';
              stpcpy (tmp, local_domain);
            }
          else

diff --git a/nis/nis_print.c b/nis/nis_print.c
index edf90c9..e6eb264 100644 (file)
--- a/nis/nis_print.c
+++ b/nis/nis_print.c
@@ -207,7 +207,7 @@ nis_print_table (const table_obj *obj)
              obj->ta_cols.ta_cols_val[i].tc_name);
       printf (_("\t\tAttributes    : %s\n"),
              nis_flags2str (obj->ta_cols.ta_cols_val[i].tc_flags));
-      fputs (_("\t\tAccess Rights : "), stdout;
+      fputs (_("\t\tAccess Rights : "), stdout);
       nis_print_rights (obj->ta_cols.ta_cols_val[i].tc_rights);
       fputc ('\n', stdout);
     }

diff --git a/nis/nis_subr.c b/nis/nis_subr.c
index 97da5ab..74eb0b5 100644 (file)
--- a/nis/nis_subr.c
+++ b/nis/nis_subr.c
@@ -33,9 +33,9 @@ nis_leaf_of (const nis_name name)
 nis_name
 nis_leaf_of_r (const nis_name name, char *buffer, size_t buflen)
 {
-  int i = 0;
+  size_t i = 0;
 
-  memset (buffer, '\0', buflen);
+  buffer[0] = '\0';
 
   while (name[i] != '.' && name[i] != '\0')
     i++;
@@ -75,15 +75,15 @@ nis_name_of_r (const nis_name name, char *buffer, size_t buflen)
   if (strcmp (&name[diff], local_domain) != 0)
     return NULL;
 
-  if (diff >= buflen)
+  if ((size_t) diff >= buflen)
     {
       errno = ERANGE;
       return NULL;
     }
-  memset (buffer, '\0', buflen);
-  strncpy (buffer, name, diff - 1);
+  memcpy (buffer, name, diff - 1);
+  buffer[diff - 1] = '\0';
 
-  if (strlen (buffer) == 0)
+  if (diff - 1 == 0)
     return NULL;
 
   return buffer;
@@ -101,19 +101,22 @@ nis_name
 nis_domain_of_r (const nis_name name, char *buffer, size_t buflen)
 {
   char *cptr;
+  size_t cptr_len;
 
-  cptr = strchr (name, '.');
-  cptr++;
+  cptr = strchr (name, '.');   /* XXX What happens if the NIS name
+                                  does not contain a `.'?  */
+  ++cptr;
+  cptr_len = strlen (cptr);
 
-  if (strlen (cptr) == 0)
+  if (cptr_len == 0)
     strcpy (buffer, ".");
-  else if (strlen (cptr) >= buflen)
+  else if (cptr_len >= buflen)
     {
       errno = ERANGE;
       return NULL;
     }
   else
-    strcpy (buffer, cptr);
+    memcpy (buffer, cptr, cptr_len + 1);
 
   return buffer;
 }
@@ -122,7 +125,7 @@ static int
 count_dots (const nis_name str)
 {
   int count = 0;
-  int i;
+  size_t i;
 
   for (i = 0; i < strlen (str); ++i)
     if (str[i] == '.')
@@ -191,7 +194,7 @@ nis_getnames (const nis_name name)
 
              getnames[pos] = tmp;
              tmp = stpcpy (tmp, name);
-             *tmp++ = '.'
+             *tmp++ = '.';
              stpcpy (tmp, cptr);
 
              ++pos;
@@ -213,9 +216,9 @@ nis_getnames (const nis_name name)
                return NULL;
 
              tmp = stpcpy (tmp, name);
-             *tmp++ = '.'
+             *tmp++ = '.';
              tmp = stpcpy (tmp, cp);
-             --tmp
+             --tmp;
              if (tmp[-1] != '.')
                *tmp++ = '.';
              stpcpy (tmp, local_domain);

diff --git a/nis/rpcsvc/nis.h b/nis/rpcsvc/nis.h
index 8624d58..c2c5319 100644 (file)
--- a/nis/rpcsvc/nis.h
+++ b/nis/rpcsvc/nis.h
@@ -41,9 +41,9 @@
  *     structures used by the NIS service. It includes the file nis_tags.h
  *     which defines the tag values. This allows the tags to change without
  *     having to change the nis.x file.
- *     
+ *
  *     NOTE : DO NOT EDIT THIS FILE! It is automatically generated when
- *            rpcgen is run on the nis.x file. Note that there is a 
+ *            rpcgen is run on the nis.x file. Note that there is a
  *            simple sed script to remove some unneeded lines. (See the
  *            Makefile target nis.h)
  *
@@ -77,23 +77,23 @@ struct nis_attr {
        } zattr_val;
 };
 typedef struct nis_attr nis_attr;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_nis_attr(XDR *, nis_attr*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_nis_attr(XDR *, nis_attr*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_nis_attr();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef char *nis_name;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_nis_name(XDR *, nis_name*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_nis_name(XDR *, nis_name*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_nis_name();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 enum zotypes {
@@ -107,13 +107,13 @@ enum zotypes {
        PRIVATE_OBJ = 7,
 };
 typedef enum zotypes zotypes;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_zotypes(XDR *, zotypes*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_zotypes(XDR *, zotypes*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_zotypes();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 enum nstype {
@@ -128,13 +128,13 @@ enum nstype {
        CDS = 8,
 };
 typedef enum nstype nstype;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_nstype(XDR *, nstype*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_nstype(XDR *, nstype*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_nstype();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct oar_mask {
@@ -142,13 +142,13 @@ struct oar_mask {
        zotypes oa_otype;
 };
 typedef struct oar_mask oar_mask;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_oar_mask(XDR *, oar_mask*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_oar_mask(XDR *, oar_mask*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_oar_mask();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct endpoint {
@@ -157,13 +157,13 @@ struct endpoint {
        char *proto;
 };
 typedef struct endpoint endpoint;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_endpoint(XDR *, endpoint*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_endpoint(XDR *, endpoint*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_endpoint();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct nis_server {
@@ -176,13 +176,13 @@ struct nis_server {
        netobj pkey;
 };
 typedef struct nis_server nis_server;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_nis_server(XDR *, nis_server*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_nis_server(XDR *, nis_server*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_nis_server();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct directory_obj {
@@ -199,13 +199,13 @@ struct directory_obj {
        } do_armask;
 };
 typedef struct directory_obj directory_obj;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_directory_obj(XDR *, directory_obj*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_directory_obj(XDR *, directory_obj*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_directory_obj();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 #define EN_BINARY 1
 #define EN_CRYPT 2
@@ -221,13 +221,13 @@ struct entry_col {
        } ec_value;
 };
 typedef struct entry_col entry_col;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_entry_col(XDR *, entry_col*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_entry_col(XDR *, entry_col*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_entry_col();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct entry_obj {
@@ -238,13 +238,13 @@ struct entry_obj {
        } en_cols;
 };
 typedef struct entry_obj entry_obj;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_entry_obj(XDR *, entry_obj*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_entry_obj(XDR *, entry_obj*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_entry_obj();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct group_obj {
@@ -255,13 +255,13 @@ struct group_obj {
        } gr_members;
 };
 typedef struct group_obj group_obj;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_group_obj(XDR *, group_obj*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_group_obj(XDR *, group_obj*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_group_obj();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct link_obj {
@@ -273,13 +273,13 @@ struct link_obj {
        nis_name li_name;
 };
 typedef struct link_obj link_obj;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_link_obj(XDR *, link_obj*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_link_obj(XDR *, link_obj*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_link_obj();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 #define TA_BINARY 1
 #define TA_CRYPT 2
@@ -295,13 +295,13 @@ struct table_col {
        u_long tc_rights;
 };
 typedef struct table_col table_col;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_table_col(XDR *, table_col*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_table_col(XDR *, table_col*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_table_col();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct table_obj {
@@ -315,13 +315,13 @@ struct table_obj {
        char *ta_path;
 };
 typedef struct table_obj table_obj;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_table_obj(XDR *, table_obj*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_table_obj(XDR *, table_obj*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_table_obj();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct objdata {
@@ -339,13 +339,13 @@ struct objdata {
        } objdata_u;
 };
 typedef struct objdata objdata;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_objdata(XDR *, objdata*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_objdata(XDR *, objdata*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_objdata();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct nis_oid {
@@ -353,13 +353,13 @@ struct nis_oid {
        u_long mtime;
 };
 typedef struct nis_oid nis_oid;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_nis_oid(XDR *, nis_oid*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_nis_oid(XDR *, nis_oid*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_nis_oid();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct nis_object {
@@ -373,13 +373,13 @@ struct nis_object {
        objdata zo_data;
 };
 typedef struct nis_object nis_object;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_nis_object(XDR *, nis_object*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_nis_object(XDR *, nis_object*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_nis_object();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 #endif /* if __nis_object_h */
@@ -436,13 +436,13 @@ enum nis_error {
        NIS_DUMPLATER = 47,
 };
 typedef enum nis_error nis_error;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_nis_error(XDR *, nis_error*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_nis_error(XDR *, nis_error*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_nis_error();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct nis_result {
@@ -458,13 +458,13 @@ struct nis_result {
        u_long cticks;
 };
 typedef struct nis_result nis_result;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_nis_result(XDR *, nis_result*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_nis_result(XDR *, nis_result*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_nis_result();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ns_request {
@@ -475,13 +475,13 @@ struct ns_request {
        } ns_object;
 };
 typedef struct ns_request ns_request;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ns_request(XDR *, ns_request*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ns_request(XDR *, ns_request*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ns_request();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ib_request {
@@ -503,13 +503,13 @@ struct ib_request {
        netobj ibr_cookie;
 };
 typedef struct ib_request ib_request;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ib_request(XDR *, ib_request*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ib_request(XDR *, ib_request*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ib_request();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ping_args {
@@ -517,13 +517,13 @@ struct ping_args {
        u_long stamp;
 };
 typedef struct ping_args ping_args;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ping_args(XDR *, ping_args*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ping_args(XDR *, ping_args*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ping_args();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 enum log_entry_t {
@@ -538,13 +538,13 @@ enum log_entry_t {
        UPD_STAMP = 8,
 };
 typedef enum log_entry_t log_entry_t;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_log_entry_t(XDR *, log_entry_t*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_log_entry_t(XDR *, log_entry_t*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_log_entry_t();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct log_entry {
@@ -559,13 +559,13 @@ struct log_entry {
        nis_object le_object;
 };
 typedef struct log_entry log_entry;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_log_entry(XDR *, log_entry*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_log_entry(XDR *, log_entry*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_log_entry();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct log_result {
@@ -577,13 +577,13 @@ struct log_result {
        } lr_entries;
 };
 typedef struct log_result log_result;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_log_result(XDR *, log_result*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_log_result(XDR *, log_result*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_log_result();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct cp_result {
@@ -592,13 +592,13 @@ struct cp_result {
        u_long cp_dticks;
 };
 typedef struct cp_result cp_result;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_cp_result(XDR *, cp_result*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_cp_result(XDR *, cp_result*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_cp_result();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct nis_tag {
@@ -606,13 +606,13 @@ struct nis_tag {
        char *tag_val;
 };
 typedef struct nis_tag nis_tag;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_nis_tag(XDR *, nis_tag*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_nis_tag(XDR *, nis_tag*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_nis_tag();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct nis_taglist {
@@ -622,13 +622,13 @@ struct nis_taglist {
        } tags;
 };
 typedef struct nis_taglist nis_taglist;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_nis_taglist(XDR *, nis_taglist*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_nis_taglist(XDR *, nis_taglist*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_nis_taglist();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct dump_args {
@@ -640,13 +640,13 @@ struct dump_args {
        } da_cbhost;
 };
 typedef struct dump_args dump_args;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_dump_args(XDR *, dump_args*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_dump_args(XDR *, dump_args*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_dump_args();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct fd_args {
@@ -654,13 +654,13 @@ struct fd_args {
        nis_name requester;
 };
 typedef struct fd_args fd_args;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_fd_args(XDR *, fd_args*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_fd_args(XDR *, fd_args*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_fd_args();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct fd_result {
@@ -676,13 +676,13 @@ struct fd_result {
        } signature;
 };
 typedef struct fd_result fd_result;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_fd_result(XDR *, fd_result*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_fd_result(XDR *, fd_result*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_fd_result();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 /*
  * Generic "hash" datastructures, used by all types of hashed data.
@@ -773,12 +773,12 @@ typedef enum name_pos name_pos;
 
 /*
  * nis_3.h
- * 
+ *
  * This file contains definitions that are only of interest to the actual
  * service daemon and client stubs. Normal users of NIS will not include
  * this file.
  *
- * NOTE : This include file is automatically created by a combination 
+ * NOTE : This include file is automatically created by a combination
  * of rpcgen and sed. DO NOT EDIT IT, change the nis.x file instead
  * and then remake this file.
  */
@@ -790,7 +790,7 @@ extern "C" {
 
 #define NIS_PROG ((u_long)100300)
 extern struct rpcgen_table nis_prog_3_table[];
-extern nis_prog_3_nproc;
+extern int nis_prog_3_nproc;
 #define NIS_VERSION ((u_long)3)
 
 #ifdef __cplusplus
@@ -929,7 +929,7 @@ extern  nis_error * nis_rmdir_3_svc(nis_name *, struct svc_req *);
 extern  nis_error * nis_updkeys_3(nis_name *, CLIENT *);
 extern  nis_error * nis_updkeys_3_svc(nis_name *, struct svc_req *);
 
-#else /* Old Style C */ 
+#else /* Old Style C */
 #define NIS_LOOKUP ((u_long)1)
 extern  nis_result * nis_lookup_3();
 extern  nis_result * nis_lookup_3_svc();
@@ -996,7 +996,7 @@ extern  nis_error * nis_rmdir_3_svc();
 #define NIS_UPDKEYS ((u_long)24)
 extern  nis_error * nis_updkeys_3();
 extern  nis_error * nis_updkeys_3_svc();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 struct rpcgen_table {
        char    *(*proc)();
        xdrproc_t       xdr_arg;

diff --git a/nis/rpcsvc/nislib.h b/nis/rpcsvc/nislib.h
index be813db..2ad38ef 100644 (file)
--- a/nis/rpcsvc/nislib.h
+++ b/nis/rpcsvc/nislib.h
@@ -85,7 +85,7 @@ extern nis_name nis_local_host __P ((void));
 /*
 ** nis_error
 */
-extern char *nis_sperrno __P ((__const nis_error));
+extern const char *nis_sperrno __P ((__const nis_error));
 extern void nis_perror __P ((__const nis_error, __const char *));
 extern void nis_lerror __P ((__const nis_error, __const char *));
 extern char *nis_sperror __P ((__const nis_error, __const char *));