nik/whois
1
0
Fork 0
mirror of https://github.com/rfc1036/whois.git synced 2026-05-03 06:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Annotate more functions with NORETURN

Browse Source 
Contributed by Sami Kerola.
Closes #48 from Github.
This commit is contained in:
Marco d'Itri 2017-02-26 23:33:01 +01:00
parent 5e33209e13
commit fb823a251a
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkpasswd.c
View File

@ -124,7 +124,7 @@ static const struct crypt_method methods[] = {
void generate_salt(char *const buf, const unsigned int len); void generate_salt(char *const buf, const unsigned int len);
void *get_random_bytes(const unsigned int len); void *get_random_bytes(const unsigned int len);
void display_help(int error); void NORETURN display_help(int error);
void display_version(void); void display_version(void);
void display_methods(void); void display_methods(void);
@ -438,7 +438,7 @@ void generate_salt(char *const buf, const unsigned int len)
#endif /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF */ #endif /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF */
void display_help(int error) void NORETURN display_help(int error)
{ {
fprintf((EXIT_SUCCESS == error) ? stdout : stderr, fprintf((EXIT_SUCCESS == error) ? stdout : stderr,
_("Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n" _("Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"

4
utils.c
View File

@ -73,7 +73,7 @@ char **merge_args(char *args, char *argv[], int *argc)
} }
/* Error routines */ /* Error routines */
void err_sys(const char *fmt, ...) void NORETURN err_sys(const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -84,7 +84,7 @@ void err_sys(const char *fmt, ...)
exit(2); exit(2);
} }
void err_quit(const char *fmt, ...) void NORETURN err_quit(const char *fmt, ...)
{ {
va_list ap; va_list ap;

4
utils.h
View File

@ -54,7 +54,7 @@
void *do_nofail(void *ptr, const char *file, const int line); void *do_nofail(void *ptr, const char *file, const int line);
char **merge_args(char *args, char *argv[], int *argc); char **merge_args(char *args, char *argv[], int *argc);
void err_quit(const char *fmt, ...) NORETURN; void NORETURN err_quit(const char *fmt, ...);
void err_sys(const char *fmt, ...) NORETURN; void NORETURN err_sys(const char *fmt, ...);
#endif #endif

6
whois.c
View File

@ -1051,13 +1051,13 @@ int connect_with_timeout(int fd, const struct sockaddr *addr,
return 0; return 0;
} }
void alarm_handler(int signum) void NORETURN alarm_handler(int signum)
{ {
close(sockfd); close(sockfd);
err_quit(_("Timeout.")); err_quit(_("Timeout."));
} }
void sighandler(int signum) void NORETURN sighandler(int signum)
{ {
close(sockfd); close(sockfd);
err_quit(_("Interrupted by signal %d..."), signum); err_quit(_("Interrupted by signal %d..."), signum);
@ -1379,7 +1379,7 @@ int isasciidigit(const char c) {
/* http://www.ripe.net/ripe/docs/databaseref-manual.html */ /* http://www.ripe.net/ripe/docs/databaseref-manual.html */
void usage(int error) void NORETURN usage(int error)
{ {
fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _( fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
"Usage: whois [OPTION]... OBJECT...\n\n" "Usage: whois [OPTION]... OBJECT...\n\n"

8
whois.h
View File

@ -1,3 +1,5 @@
#include "utils.h"
/* 6bone referto: extension */ /* 6bone referto: extension */
#define REFERTO_FORMAT "%% referto: whois -h %255s -p %15s %1021[^\n\r]" #define REFERTO_FORMAT "%% referto: whois -h %255s -p %15s %1021[^\n\r]"
@ -21,9 +23,9 @@ char *query_crsnic(const int, const char *);
char *query_afilias(const int, const char *); char *query_afilias(const int, const char *);
int openconn(const char *, const char *); int openconn(const char *, const char *);
int connect_with_timeout(int, const struct sockaddr *, socklen_t, int); int connect_with_timeout(int, const struct sockaddr *, socklen_t, int);
void usage(int error); void NORETURN usage(int error);
void alarm_handler(int); void NORETURN alarm_handler(int);
void sighandler(int); void NORETURN sighandler(int);
int japanese_locale(void); int japanese_locale(void);
unsigned long myinet_aton(const char *); unsigned long myinet_aton(const char *);
unsigned long asn32_to_long(const char *); unsigned long asn32_to_long(const char *);