aac: fix some signedness warnings

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 34b18f193bef5dd4f8a54083cbb4c842ae3ed8be..732a5470c5c6f928131ec4721c6dbf90a5ddf3e2 100644 (file)
--- a/error.h
+++ b/error.h
@@ -55,7 +55,7 @@ enum para_subsystem {
        SS_CRYPT,
        SS_HTTP_SEND,
        SS_ORTP_SEND,
-       SS_DB,
+       SS_AFS,
        SS_OGG_AFH,
        SS_MP3_AFH,
        SS_AAC_AFH,
@@ -97,7 +97,6 @@ extern const char **para_errlist[];
 
 #define USER_LIST_ERRORS \
        PARA_ERROR(USERLIST, "failed to open user list file"), \
-       PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 
 
 #define OSX_WRITE_ERRORS \
@@ -203,6 +202,7 @@ extern const char **para_errlist[];
        PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
        PARA_ERROR(UCRED_PERM, "permission denied"), \
        PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \
+       PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 
 
 #define FILTER_CHAIN_ERRORS \
@@ -264,8 +264,6 @@ extern const char **para_errlist[];
 
 
 #define MP3_AFH_ERRORS \
-       PARA_ERROR(FREAD, "fread error"), \
-       PARA_ERROR(FSEEK, "fseek error"), \
        PARA_ERROR(FRAME, "invalid mp3 frame"), \
        PARA_ERROR(FRAME_LENGTH, "invalid frame length"), \
        PARA_ERROR(MP3_NO_FILE, "invalid mp3 file pointer"), \
@@ -276,11 +274,8 @@ extern const char **para_errlist[];
 
 
 #define AAC_AFH_ERRORS \
-       PARA_ERROR(AAC_REPOS, "aac repositioning error"), \
-       PARA_ERROR(AAC_READ, "aac read error"), \
        PARA_ERROR(STSZ, "did not find stcz atom"), \
        PARA_ERROR(MP4ASC, "audio spec config error"), \
-       PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \
 
 
 #define AAC_COMMON_ERRORS \
@@ -303,9 +298,10 @@ extern const char **para_errlist[];
 #define VSS_ERRORS \
        PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
        PARA_ERROR(FSTAT, "failed to fstat() audio file"), \
+       PARA_ERROR(EMPTY_CHUNK, "empty chunk"), \
 
 
-#define DB_ERRORS \
+#define AFS_ERRORS \
        PARA_ERROR(GETCWD, "can not get current working directory"), \
        PARA_ERROR(CHDIR, "can not change directory"), \
        PARA_ERROR(OPENDIR, "can not open directory"), \
@@ -380,8 +376,6 @@ extern const char **para_errlist[];
 
 #define DCCP_ERRORS \
        PARA_ERROR(DCCP_SOCKET, "can not create dccp socket"), \
-       PARA_ERROR(DCCP_PACKET_SIZE, "failed to set dccp packet size"), \
-       PARA_ERROR(DCCP_SERVICE, "could not get service code"), \
        PARA_ERROR(DCCP_RECV_EOF, "dccp_recv: end of file"), \
 
 
@@ -401,6 +395,8 @@ extern const char **para_errlist[];
        PARA_ERROR(F_GETFL, "failed to get fd flags"), \
        PARA_ERROR(F_SETFL, "failed to set fd flags"), \
        PARA_ERROR(FGETS, "fgets error"), \
+       PARA_ERROR(FSEEK, "fseek error"), \
+       PARA_ERROR(FREAD, "fread error"), \
 
 
 #define WRITE_ERRORS \
@@ -446,6 +442,7 @@ extern const char **para_errlist[];
 #define AACDEC_ERRORS \
        PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
        PARA_ERROR(AAC_DECODE, "aac decode error"), \
+       PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \
 
 
 /**
@@ -559,7 +556,7 @@ SS_ENUM(PLAYLIST_SELECTOR);
 SS_ENUM(CRYPT);
 SS_ENUM(HTTP_SEND);
 SS_ENUM(ORTP_SEND);
-SS_ENUM(DB);
+SS_ENUM(AFS);
 SS_ENUM(MYSQL_SELECTOR);
 SS_ENUM(IPC);
 SS_ENUM(DCCP);