diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2009-03-17 17:41:36 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2009-03-17 17:41:36 +0000 |
| commit | edb1d6ef2fbfbc24fcf921d820b4d6c083a66dcb (patch) | |
| tree | 882dce6aef71dafce24a91d86c3c477791fb1dd1 | |
| parent | 4c8c18106e3f50e86804469fdbb4eb2f6f9fdac7 (diff) | |
| download | glibc-edb1d6ef2fbfbc24fcf921d820b4d6c083a66dcb.tar.xz glibc-edb1d6ef2fbfbc24fcf921d820b4d6c083a66dcb.zip | |
* sysdeps/unix/sysv/linux/m68k/getsysstats.c (GET_NPROCS_PARSER):
Change parameters and use next_line.
| -rw-r--r-- | ChangeLog.m68k | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/getsysstats.c | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog.m68k b/ChangeLog.m68k index 32d01cf7bb..b6305783ad 100644 --- a/ChangeLog.m68k +++ b/ChangeLog.m68k @@ -1,3 +1,8 @@ +2009-03-17 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/unix/sysv/linux/m68k/getsysstats.c (GET_NPROCS_PARSER): + Change parameters and use next_line. + 2009-03-15 Joseph Myers <joseph@codesourcery.com> * sysdeps/m68k/bits/link.h: Uglify function parameter names. diff --git a/sysdeps/unix/sysv/linux/m68k/getsysstats.c b/sysdeps/unix/sysv/linux/m68k/getsysstats.c index 23207e9bcb..51137204e3 100644 --- a/sysdeps/unix/sysv/linux/m68k/getsysstats.c +++ b/sysdeps/unix/sysv/linux/m68k/getsysstats.c @@ -1,5 +1,5 @@ /* Determine various system internal values, Linux/m68k version. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Schwab <schwab@suse.de> @@ -20,7 +20,7 @@ /* We need to define a special parser for /proc/cpuinfo. */ -#define GET_NPROCS_PARSER(FP, BUFFER, RESULT) \ +#define GET_NPROCS_PARSER(FD, BUFFER, CP, RE, BUFFER_END, RESULT) \ do \ { \ (RESULT) = 0; \ @@ -28,8 +28,9 @@ "CPU:". 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 (strncmp (BUFFER, "CPU:", 4) == 0) \ + char *l; \ + while ((l = next_line (FD, BUFFER, &CP, &RE, BUFFER_END)) != NULL) \ + if (strncmp (l, "CPU:", 4) == 0) \ ++(RESULT); \ } \ while (0) |
