Merge changes from CUPS 1.6svn-r9968.

[thirdparty/cups.git] / systemv / lppasswd.c

diff --git a/systemv/lppasswd.c b/systemv/lppasswd.c
index 7baa53a9334c5f7105dafe8b2b403ab309473277..b9962ecfc02cacab8c6ad592a4653fd9674b6190 100644 (file)
--- a/systemv/lppasswd.c
+++ b/systemv/lppasswd.c
@@ -3,7 +3,7 @@
  *
  *   MD5 password program for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -48,7 +48,7 @@
  * Local functions...
  */
 
-static void    usage(FILE *fp);
+static void    usage(FILE *fp) __attribute__((noreturn));
 
 
 /*
@@ -429,7 +429,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
   if (error)
   {
     _cupsLangPuts(stderr, _("lppasswd: Password file not updated."));
-    
+
     unlink(passwdnew);
 
     return (1);
@@ -475,7 +475,7 @@ usage(FILE *fp)             /* I - File to send usage to */
   if (getuid())
     _cupsLangPuts(fp, _("Usage: lppasswd [-g groupname]"));
   else
-    _cupsLangPuts(fp, 
+    _cupsLangPuts(fp,
                   _("Usage: lppasswd [-g groupname] [username]\n"
                    "       lppasswd [-g groupname] -a [username]\n"
                    "       lppasswd [-g groupname] -x [username]"));