- dtucker@cvs.openbsd.org 2008/06/13 01:38:23

     [misc.c]
     upcast uid to long with matching %ld, prevents warnings in portable

diff --git a/ChangeLog b/ChangeLog
index 570aad3342acf192e625a8e8132b0b622506debf..4aa15d8b7fc9662792291da92355ab706a8dab31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -154,6 +154,9 @@
    - dtucker@cvs.openbsd.org 2008/06/13 00:51:47
      [mac.c]
      upcast another size_t to u_long to match format
+   - dtucker@cvs.openbsd.org 2008/06/13 01:38:23
+     [misc.c]
+     upcast uid to long with matching %ld, prevents warnings in portable
   - (dtucker) [clientloop.c serverloop.c]  channel_register_filter now
     takes 2 more args.  with djm@
   - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch

diff --git a/misc.c b/misc.c
index 01986e8c12cd5425a0f87ec6650955f3fce2a731..8b303f16f7720f4a4cb5e344394a627f5bacb6a7 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.68 2008/06/12 20:38:28 dtucker Exp $ */
+/* $OpenBSD: misc.c,v 1.69 2008/06/13 01:38:23 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -534,7 +534,7 @@ tilde_expand_filename(const char *filename, uid_t uid)
                if ((pw = getpwnam(user)) == NULL)
                        fatal("tilde_expand_filename: No such user %s", user);
        } else if ((pw = getpwuid(uid)) == NULL)        /* ~/path */
-               fatal("tilde_expand_filename: No such uid %d", uid);
+               fatal("tilde_expand_filename: No such uid %ld", (long)uid);
 
        if (strlcpy(ret, pw->pw_dir, sizeof(ret)) >= sizeof(ret))
                fatal("tilde_expand_filename: Path too long");