From: Roland McGrath Date: Wed, 7 Jul 2004 09:49:02 +0000 (+0000) Subject: * nss/getent.c (print_group, print_passwd): Use %lu format for X-Git-Tag: cvs/fedora-base~337 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c61a8bb4a9d1d2c8fa1354b18c5c576cba12608b;p=platform%2Fupstream%2Fglibc.git * 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. --- diff --git a/ChangeLog b/ChangeLog index 7f34fa1..12a47ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-07-06 Thorsten Kukuk + + * 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 * Makefile (dist-separate): New variable. diff --git a/nss/getent.c b/nss/getent.c index 5738aff..26df380 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 2b3db38..da65721 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. */