CVS commit: src/usr.sbin/isdn/isdntel

[Joerg Sonnenberger]

Module Name:    src
Committed By:   joerg
Date:           Wed Aug 31 13:30:45 UTC 2011

Modified Files:
        src/usr.sbin/isdn/isdntel: defs.h main.c

Log Message:
Use __dead and __printflike


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/isdn/isdntel/defs.h
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/isdn/isdntel/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.sbin/isdn/isdntel/defs.h
diff -u src/usr.sbin/isdn/isdntel/defs.h:1.3 src/usr.sbin/isdn/isdntel/defs.h:1.4
--- src/usr.sbin/isdn/isdntel/defs.h:1.3	Thu Apr 16 05:56:33 2009
+++ src/usr.sbin/isdn/isdntel/defs.h	Wed Aug 31 13:30:44 2011
@@ -27,7 +27,7 @@
  *	isdntel - isdn4bsd telephone answering support
  *      ==============================================
  *
- *	$Id: defs.h,v 1.3 2009/04/16 05:56:33 lukem Exp $ 
+ *	$Id: defs.h,v 1.4 2011/08/31 13:30:44 joerg Exp $ 
  *
  * $FreeBSD$
  *
@@ -148,11 +148,9 @@
 extern int fill_list( void );
 extern char *get_alias( char *number );
 extern int main ( int argc, char **argv );
-extern void do_quit ( int exitval );
-extern void fatal ( const char *fmt, ... )
-    __attribute__((__noreturn__, __format__(__printf__, 1, 2)));
-extern void error ( const char *fmt, ... )
-    __attribute__((__format__(__printf__, 1, 2)));
+extern void do_quit ( int exitval ) __dead;
+extern void fatal ( const char *fmt, ... ) __dead __printflike(1, 2);
+extern void error ( const char *fmt, ... ) __printflike(1, 2);
 extern void play ( struct onefile * );
 extern void delete ( struct onefile * );
 extern void reread( void );

Index: src/usr.sbin/isdn/isdntel/main.c
diff -u src/usr.sbin/isdn/isdntel/main.c:1.7 src/usr.sbin/isdn/isdntel/main.c:1.8
--- src/usr.sbin/isdn/isdntel/main.c:1.7	Thu Apr 16 05:56:33 2009
+++ src/usr.sbin/isdn/isdntel/main.c	Wed Aug 31 13:30:44 2011
@@ -27,7 +27,7 @@
  *	isdntel - isdn4bsd telephone answering machine support
  *      ======================================================
  *
- *      $Id: main.c,v 1.7 2009/04/16 05:56:33 lukem Exp $ 
+ *      $Id: main.c,v 1.8 2011/08/31 13:30:44 joerg Exp $ 
  *
  * $FreeBSD$
  *
@@ -40,7 +40,7 @@
 #include "defs.h"
 #include "alias.h"
 
-static void usage( void );
+__dead static void usage( void );
 
 static int top_dis = 0;
 static int bot_dis = 0;