X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=537aca5723e48a2ea32037fd342dca2f5068859c;hp=b94139e38b013cec2bd5cbbcb954f04ee2708c72;hb=1d298ac7426fdc13221f759848dbf766ef606c0b;hpb=1fe76952bf4244b93808da5e8fc45e92d8b37c58

diff --git a/error.h b/error.h
index b94139e3..537aca57 100644
--- 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
@@ -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,
@@ -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,12 +300,12 @@ 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"), \
 
 
-#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"), \
@@ -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,14 +552,14 @@ 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);
 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);