aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-08-04 16:01:55 +0000
committerUlrich Drepper <drepper@redhat.com>1999-08-04 16:01:55 +0000
commit2f638d5e5aba6f39a446143e66ed926406c0ae9d (patch)
tree57d8d5aca7f9294aa4dfdd982cc6c2ec2afc57b0
parent630b9a59e11b1f2c0a2e7a41c1100f959c831cd3 (diff)
downloadglibc-2f638d5e5aba6f39a446143e66ed926406c0ae9d.zip
glibc-2f638d5e5aba6f39a446143e66ed926406c0ae9d.tar.gz
glibc-2f638d5e5aba6f39a446143e66ed926406c0ae9d.tar.bz2
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.
-rw-r--r--ChangeLog6
-rw-r--r--inet/ether_hton.c4
-rw-r--r--inet/getnetgrent_r.c2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/getsysstats.c48
4 files changed, 34 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e126ef..b1bf74d 100644
--- 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 848fe92..8a1325b 100644
--- 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 d3a9a14..aee67cf 100644
--- 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 8588903..27355b5 100644
--- 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>