X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=57f581cf3fc405c46b919adfc6c4808c05424c82;hp=c28a25a39bf7da44bfb20d330765912d8912ba6b;hb=ad0a32acc373428d38e6b0f2f244ac3c31eea7c5;hpb=97ad8ac8735dfd7a514aa66e9de54f253440c17d diff --git a/error.h b/error.h index c28a25a3..57f581cf 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -161,7 +161,6 @@ extern const char **para_errlist[]; #define PREBUFFER_FILTER_ERRORS \ - PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \ PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \ @@ -210,7 +209,6 @@ extern const char **para_errlist[]; #define AMP_FILTER_ERRORS \ - PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \ PARA_ERROR(AMP_ZERO_AMP, "no amplification necessary"), \ PARA_ERROR(AMP_EOF, "amp: end of file"), \ @@ -259,7 +257,6 @@ extern const char **para_errlist[]; #define BLOB_ERRORS \ PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \ - PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \ #define PLAYLIST_ERRORS \ @@ -269,7 +266,7 @@ extern const char **para_errlist[]; #define AFT_ERRORS \ - PARA_ERROR(BAD_AFSI, "invaiid afs info"), \ + PARA_ERROR(BAD_AFSI, "invalid afs info"), \ PARA_ERROR(LOCALTIME, "localtime() failed"), \ PARA_ERROR(STRFTIME, "strftime() failed"), \ PARA_ERROR(BAD_PATH, "invalid path"), \ @@ -301,7 +298,6 @@ extern const char **para_errlist[]; PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \ PARA_ERROR(NO_CONFIG, "config file not found"), \ PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \ - PARA_ERROR(CLIENT_AUTH, "authentication failed"), \ PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \ PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \ PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \ @@ -390,7 +386,6 @@ extern const char **para_errlist[]; #define STRING_ERRORS \ PARA_ERROR(ATOI_OVERFLOW, "value too large"), \ - PARA_ERROR(STRTOLL, "unknown strtoll error"), \ PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \ PARA_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \ PARA_ERROR(SIZE_PREFIX, "bad size prefix"), \ @@ -583,7 +578,7 @@ extern const char **para_errlist[]; * \return True if \a num is paraslash's representation of the system * error identified by \a _errno. */ -_static_inline_ int is_errno(int num, int _errno) +_static_inline_ bool is_errno(int num, int _errno) { assert(num > 0 && _errno > 0); return ERRNO_TO_PARA_ERROR(_errno) == num; @@ -628,9 +623,9 @@ _static_inline_ int osl(int ret) /** * Define the error list for one subsystem. - # - * The first entry (index 0) is always the name of the subsystem - * Used by macros in config.h (generated by configure). + * + * The first entry (index 0) is always the name of the subsystem. Used by + * macros in config.h (generated by configure). */ #define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {#ss, ss ## _ERRORS}