the paraslash-0.2.15 release tarball

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index b94139e38b013cec2bd5cbbcb954f04ee2708c72..b970947704dffb401097a5ebe4d88a8624ad423a 100644 (file)
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ enum para_subsystem {
        SS_AACDEC,
        SS_AAC_COMMON,
        SS_SERVER,
-       SS_AFS,
+       SS_VSS,
        SS_MYSQL_SELECTOR,
        SS_IPC,
        SS_DCCP,
@@ -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 \
@@ -300,7 +300,7 @@ extern const char **para_errlist[];
        PARA_ERROR(OGG_REPOS, "ogg repositioning error"), \
 
 
-#define AFS_ERRORS \
+#define VSS_ERRORS \
        PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
        PARA_ERROR(FSTAT, "failed to fstat() audio file"), \
 
@@ -518,7 +518,7 @@ extern const char **para_errlist[];
  */
 #define PARA_ERROR(err, msg) E_ ## err
 
-#define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : ""
+// #define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : ""
 
 /** \cond popcorn time */
 SS_ENUM(GUI);
@@ -552,7 +552,7 @@ SS_ENUM(OGG_AFH);
 SS_ENUM(AAC_AFH);
 SS_ENUM(AAC_COMMON);
 SS_ENUM(SERVER);
-SS_ENUM(AFS);
+SS_ENUM(VSS);
 SS_ENUM(COMMAND);
 SS_ENUM(RANDOM_SELECTOR);
 SS_ENUM(PLAYLIST_SELECTOR);