Update.

1999-08-04  Andreas Schwab  <schwab@suse.de>

	* sysdeps/unix/sysv/linux/alpha/getsysstats.c (GET_NPROCS_PARSER):
	Initialize result to one.
	(GET_NPROCS_CONF_PARSER): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 3e126ef760d6184e62a77b6edaee41705e3ac4b1..b1bf74d02689a644d3a35690d568a1f7cd240741 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-08-04  Andreas Schwab  <schwab@suse.de>
+
+       * sysdeps/unix/sysv/linux/alpha/getsysstats.c (GET_NPROCS_PARSER):
+       Initialize result to one.
+       (GET_NPROCS_CONF_PARSER): Likewise.
+
 1999-08-03  Ulrich Drepper  <drepper@cygnus.com>
 
        * inet/ether_hton.c: Pass errno pointer to NSS function.

diff --git a/inet/ether_hton.c b/inet/ether_hton.c
index 848fe92115d2f7272fe415a3197a903c53d41095..8a1325b728b07d40df6ecb01fa297f4211fabfd5 100644 (file)
--- a/inet/ether_hton.c
+++ b/inet/ether_hton.c
@@ -17,6 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <errno.h>
 #include <netinet/ether.h>
 #include <netinet/if_ether.h>
 #include <string.h>
@@ -34,7 +35,8 @@ struct etherent
 
 
 /* Type of the lookup function we need here.  */
-typedef int (*lookup_function) (const char *, struct etherent *, char *, int);
+typedef int (*lookup_function) (const char *, struct etherent *, char *, int,
+                               int *);
 
 /* The lookup function for the first entry of this service.  */
 extern int __nss_ethers_lookup (service_user **nip, const char *name,

diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index d3a9a14630e2c13673ad9de292fb18f3d5a6d277..aee67cfed1b3806dfb423ff2ff9e517f34d14967 100644 (file)
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -195,7 +195,7 @@ __internal_getnetgrent_r (char **hostp, char **userp, char **domainp,
                          struct __netgrent *datap,
                          char *buffer, size_t buflen, int *errnop)
 {
-  enum nss_status (*fct) (struct __netgrent *, char *, size_t);
+  enum nss_status (*fct) (struct __netgrent *, char *, size_t, int *);
   int no_more;
 
   /* Initialize status to return if no more functions are found.  */

diff --git a/sysdeps/unix/sysv/linux/alpha/getsysstats.c b/sysdeps/unix/sysv/linux/alpha/getsysstats.c
index 8588903c89f4a94c342b6f945f56b76121f3207e..27355b5fe45a3734262d2d0e546ba7f55efb5048 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/getsysstats.c
+++ b/sysdeps/unix/sysv/linux/alpha/getsysstats.c
@@ -20,35 +20,35 @@
 
 
 /* We need to define a special parser for /proc/cpuinfo.  */
-#define GET_NPROCS_PARSER(FP, BUFFER, RESULT)                            \
-  do                                                                     \
-    {                                                                    \
-      (RESULT) = 0;                                                      \
-      /* Find the line that contains the information about the number of  \
-        active cpus.  We don't have to fear extremely long lines since   \
-        the kernel will not generate them.  8192 bytes are really        \
-        enough.  */                                                      \
-      while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL)       \
-       if (sscanf (BUFFER, "CPUs probed %*d active %d", &(RESULT)) == 1) \
-         break;                                                          \
-    }                                                                    \
+#define GET_NPROCS_PARSER(FP, BUFFER, RESULT)                             \
+  do                                                                      \
+    {                                                                     \
+      /* Find the line that contains the information about the number of   \
+        active cpus.  We don't have to fear extremely long lines since    \
+        the kernel will not generate them.  8192 bytes are really enough. \
+        If there is no "CPUs ..." line then we are on a UP system.  */    \
+      (RESULT) = 1;                                                       \
+      while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL)        \
+       if (sscanf (BUFFER, "CPUs probed %*d active %d", &(RESULT)) == 1)  \
+         break;                                                           \
+    }                                                                     \
   while (0)
 
 
 /* On the Alpha we can distinguish between the number of configured and
    active cpus.  */
-#define GET_NPROCS_CONF_PARSER(FP, BUFFER, RESULT)                      \
-  do                                                                    \
-    {                                                                   \
-      (RESULT) = 0;                                                     \
-      /* Find the line that contains the information about the number of \
-        probed cpus.  We don't have to fear extremely long lines since  \
-        the kernel will not generate them.  8192 bytes are really       \
-        enough.  */                                                     \
-      while (fgets_unlocked ((BUFFER), sizeof (BUFFER), (FP)) != NULL)  \
-       if (sscanf (buffer, "CPUs probed %d", &(RESULT)) == 1)           \
-         break;                                                         \
-    }                                                                   \
+#define GET_NPROCS_CONF_PARSER(FP, BUFFER, RESULT)                        \
+  do                                                                      \
+    {                                                                     \
+      /* Find the line that contains the information about the number of   \
+        probed cpus.  We don't have to fear extremely long lines since    \
+        the kernel will not generate them.  8192 bytes are really enough. \
+        If there is no "CPUs ..." line then we are on a UP system.  */    \
+      (RESULT) = 1;                                                       \
+      while (fgets_unlocked ((BUFFER), sizeof (BUFFER), (FP)) != NULL)    \
+       if (sscanf (buffer, "CPUs probed %d", &(RESULT)) == 1)             \
+         break;                                                           \
+    }                                                                     \
   while (0)
 
 #include <sysdeps/unix/sysv/linux/getsysstats.c>