diff options
author | Roland McGrath <roland@gnu.org> | 2004-07-07 09:49:02 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2004-07-07 09:49:02 +0000 |
commit | c61a8bb4a9d1d2c8fa1354b18c5c576cba12608b (patch) | |
tree | 7982d11770c9e7d44bf30b36042472ac9bf465bd | |
parent | ec5a15a32b96e98ce0cdf49a48e880be6bbc10b4 (diff) | |
download | glibc-c61a8bb4a9d1d2c8fa1354b18c5c576cba12608b.tar.gz glibc-c61a8bb4a9d1d2c8fa1354b18c5c576cba12608b.tar.xz glibc-c61a8bb4a9d1d2c8fa1354b18c5c576cba12608b.zip |
* nss/getent.c (print_group, print_passwd): Use %lu format for
`unsigned long int' values. * sysdeps/unix/sysv/linux/i386/fcntl.c (__fcntl_nocancel): Fix syntax error typos in goto statements.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | nss/getent.c | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/fcntl.c | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 7f34fa1572..12a47abcf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-07-06 Thorsten Kukuk <kukuk@suse.de> + + * nss/getent.c (print_group, print_passwd): Use %lu format for + `unsigned long int' values. + + * sysdeps/unix/sysv/linux/i386/fcntl.c (__fcntl_nocancel): Fix syntax + error typos in goto statements. + 2004-07-07 Roland McGrath <roland@frob.com> * Makefile (dist-separate): New variable. diff --git a/nss/getent.c b/nss/getent.c index 5738affd53..26df38068a 100644 --- a/nss/getent.c +++ b/nss/getent.c @@ -174,7 +174,7 @@ print_group (struct group *grp) { unsigned int i = 0; - printf ("%s:%s:%ld:", grp->gr_name ? grp->gr_name : "", + printf ("%s:%s:%lu:", grp->gr_name ? grp->gr_name : "", grp->gr_passwd ? grp->gr_passwd : "", (unsigned long int) grp->gr_gid); @@ -453,7 +453,7 @@ networks_keys (int number, char *key[]) static inline void print_passwd (struct passwd *pwd) { - printf ("%s:%s:%ld:%ld:%s:%s:%s\n", + printf ("%s:%s:%lu:%lu:%s:%s:%s\n", pwd->pw_name ? pwd->pw_name : "", pwd->pw_passwd ? pwd->pw_passwd : "", (unsigned long int) pwd->pw_uid, diff --git a/sysdeps/unix/sysv/linux/i386/fcntl.c b/sysdeps/unix/sysv/linux/i386/fcntl.c index 2b3db38e53..da65721ea2 100644 --- a/sysdeps/unix/sysv/linux/i386/fcntl.c +++ b/sysdeps/unix/sysv/linux/i386/fcntl.c @@ -75,7 +75,7 @@ __fcntl_nocancel (int fd, int cmd, ...) fl.l_len = (off_t) fl64->l_len; /* Check if we can represent the values with the smaller type. */ if ((off64_t) fl.l_len != fl64->l_len) - goto eoverflow: + goto eoverflow; fl.l_type = fl64->l_type; fl.l_whence = fl64->l_whence; @@ -103,7 +103,7 @@ __fcntl_nocancel (int fd, int cmd, ...) fl.l_start = (off_t) fl64->l_start; /* Check if we can represent the values with the smaller type. */ if ((off64_t) fl.l_start != fl64->l_start) - goto eoverflow: + goto eoverflow; fl.l_len = (off_t)fl64->l_len; /* Check if we can represent the values with the smaller type. */ |