Index: ossp-pkg/rc/rc_const.h RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_const.h,v rcsdiff -q -kk '-r1.30' '-r1.31' -u '/v/ossp/cvs/ossp-pkg/rc/rc_const.h,v' 2>/dev/null --- rc_const.h 2003/06/27 14:26:13 1.30 +++ rc_const.h 2003/07/02 14:45:25 1.31 @@ -116,20 +116,21 @@ #define RC_ERR_NAME "NameError" /* Error and warning strings, should not include newline termination */ -#define RC_ERRSTR_OK "Okay" -#define RC_ERRSTR_USE "Usage" -#define RC_ERRSTR_MEM "Memory" -#define RC_ERRSTR_SYS "System" -#define RC_ERRSTR_IO "Input/Output" -#define RC_ERRSTR_INT "Internal" -#define RC_ERRSTR_FNC "Funcfile" -#define RC_ERRSTR_DIR "Location" -#define RC_ERRSTR_RCF "Rcfile" -#define RC_ERRSTR_TRM "Terminate" -#define RC_ERRSTR_CFG "Config/Options" -#define RC_ERRSTR_UNK "Unrecognized" -#define RC_WRNSTR_OWR "Overwrite" -#define RC_WRNSTR_NUL "NULLPointer" +#define RC_ERRSTR_OK "Okay" +#define RC_ERRSTR_USE "Usage" +#define RC_ERRSTR_MEM "Memory" +#define RC_ERRSTR_SYS "System" +#define RC_ERRSTR_IO "Input/Output" +#define RC_ERRSTR_INT "Internal" +#define RC_ERRSTR_FNC "Funcfile" +#define RC_ERRSTR_DIR "Location" +#define RC_ERRSTR_RCF "Rcfile" +#define RC_ERRSTR_TRM "Terminate" +#define RC_ERRSTR_CFG "Config/Options" +#define RC_ERRSTR_ROOT "Permissions" +#define RC_ERRSTR_UNK "Unrecognized" +#define RC_WRNSTR_OWR "Overwrite" +#define RC_WRNSTR_NUL "NULLPointer" #define RC_GLOB_WILD "all" Index: ossp-pkg/rc/rc_util.c RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_util.c,v rcsdiff -q -kk '-r1.10' '-r1.11' -u '/v/ossp/cvs/ossp-pkg/rc/rc_util.c,v' 2>/dev/null --- rc_util.c 2003/06/23 16:09:47 1.10 +++ rc_util.c 2003/07/02 14:45:25 1.11 @@ -37,20 +37,21 @@ /* Translate an error code to a string */ char *strErr(rc_return_t rv) { - if (rv == RC_OK) return RC_ERRSTR_OK; - else if (rv == RC_ERR_USE) return RC_ERRSTR_USE; - else if (rv == RC_ERR_MEM) return RC_ERRSTR_MEM; - else if (rv == RC_ERR_SYS) return RC_ERRSTR_SYS; - else if (rv == RC_ERR_IO) return RC_ERRSTR_IO; - else if (rv == RC_ERR_INT) return RC_ERRSTR_INT; - else if (rv == RC_ERR_FNC) return RC_ERRSTR_FNC; - else if (rv == RC_ERR_DIR) return RC_ERRSTR_DIR; - else if (rv == RC_ERR_RCF) return RC_ERRSTR_RCF; - else if (rv == RC_ERR_TRM) return RC_ERRSTR_TRM; - else if (rv == RC_ERR_CFG) return RC_ERRSTR_CFG; - else if (rv == RC_WRN_OWR) return RC_WRNSTR_OWR; - else if (rv == RC_WRN_NUL) return RC_WRNSTR_NUL; - else return RC_ERRSTR_UNK; + if (rv == RC_OK) return RC_ERRSTR_OK; + else if (rv == RC_ERR_USE) return RC_ERRSTR_USE; + else if (rv == RC_ERR_MEM) return RC_ERRSTR_MEM; + else if (rv == RC_ERR_SYS) return RC_ERRSTR_SYS; + else if (rv == RC_ERR_IO) return RC_ERRSTR_IO; + else if (rv == RC_ERR_INT) return RC_ERRSTR_INT; + else if (rv == RC_ERR_FNC) return RC_ERRSTR_FNC; + else if (rv == RC_ERR_DIR) return RC_ERRSTR_DIR; + else if (rv == RC_ERR_RCF) return RC_ERRSTR_RCF; + else if (rv == RC_ERR_TRM) return RC_ERRSTR_TRM; + else if (rv == RC_ERR_CFG) return RC_ERRSTR_CFG; + else if (rv == RC_ERR_ROOT) return RC_ERRSTR_ROOT; + else if (rv == RC_WRN_OWR) return RC_WRNSTR_OWR; + else if (rv == RC_WRN_NUL) return RC_WRNSTR_NUL; + else return RC_ERRSTR_UNK; } /* Vector copy constructor */