about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--nss/getent.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/fcntl.c4
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.  */