diff options
| author | Bodo Möller <bodo@openssl.org> | 2005-05-11 03:45:39 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2005-05-11 03:45:39 +0000 |
| commit | 8afca8d9c60c3d7db6f9bc94a97c77f016fc139d (patch) | |
| tree | df6c0046c8ebb68825940173c750ae0fb37f0f0c /crypto/dso | |
| parent | 35e8510e60ef0b033b304289db28a3cb19c6cbdd (diff) | |
Fix more error codes.
(Also improve util/ck_errf.pl script, and occasionally
fix source code formatting.)
Diffstat (limited to 'crypto/dso')
| -rw-r--r-- | crypto/dso/dso.h | 2 | ||||
| -rw-r--r-- | crypto/dso/dso_err.c | 2 | ||||
| -rw-r--r-- | crypto/dso/dso_win32.c | 12 |
3 files changed, 10 insertions, 6 deletions
diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h index 5cacc342fc..3de99f5d00 100644 --- a/crypto/dso/dso.h +++ b/crypto/dso/dso.h @@ -336,9 +336,11 @@ void ERR_load_DSO_strings(void); #define DSO_F_VMS_UNLOAD 117 #define DSO_F_WIN32_BIND_FUNC 118 #define DSO_F_WIN32_BIND_VAR 119 +#define DSO_F_WIN32_JOINER 135 #define DSO_F_WIN32_LOAD 120 #define DSO_F_WIN32_MERGER 134 #define DSO_F_WIN32_NAME_CONVERTER 125 +#define DSO_F_WIN32_SPLITTER 136 #define DSO_F_WIN32_UNLOAD 121 /* Reason codes. */ diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c index bc0af84e01..aa91170b1b 100644 --- a/crypto/dso/dso_err.c +++ b/crypto/dso/dso_err.c @@ -101,9 +101,11 @@ static ERR_STRING_DATA DSO_str_functs[]= {ERR_FUNC(DSO_F_VMS_UNLOAD), "VMS_UNLOAD"}, {ERR_FUNC(DSO_F_WIN32_BIND_FUNC), "WIN32_BIND_FUNC"}, {ERR_FUNC(DSO_F_WIN32_BIND_VAR), "WIN32_BIND_VAR"}, +{ERR_FUNC(DSO_F_WIN32_JOINER), "WIN32_JOINER"}, {ERR_FUNC(DSO_F_WIN32_LOAD), "WIN32_LOAD"}, {ERR_FUNC(DSO_F_WIN32_MERGER), "WIN32_MERGER"}, {ERR_FUNC(DSO_F_WIN32_NAME_CONVERTER), "WIN32_NAME_CONVERTER"}, +{ERR_FUNC(DSO_F_WIN32_SPLITTER), "WIN32_SPLITTER"}, {ERR_FUNC(DSO_F_WIN32_UNLOAD), "WIN32_UNLOAD"}, {0,NULL} }; diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index 1dcafc6eab..e6eaa99005 100644 --- a/crypto/dso/dso_win32.c +++ b/crypto/dso/dso_win32.c @@ -271,7 +271,7 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename, if (!filename) { - DSOerr(DSO_F_WIN32_MERGER,DSO_R_NO_FILENAME); + DSOerr(DSO_F_WIN32_SPLITTER,DSO_R_NO_FILENAME); /*goto err;*/ return(NULL); } @@ -279,7 +279,7 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename, result = OPENSSL_malloc(sizeof(struct file_st)); if(result == NULL) { - DSOerr(DSO_F_WIN32_MERGER, + DSOerr(DSO_F_WIN32_SPLITTER, ERR_R_MALLOC_FAILURE); return(NULL); } @@ -303,7 +303,7 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename, case ':': if(position != IN_DEVICE) { - DSOerr(DSO_F_WIN32_MERGER, + DSOerr(DSO_F_WIN32_SPLITTER, DSO_R_INCORRECT_FILE_SYNTAX); /*goto err;*/ return(NULL); @@ -373,7 +373,7 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split) if(!file_split) { - DSOerr(DSO_F_WIN32_MERGER, + DSOerr(DSO_F_WIN32_JOINER, ERR_R_PASSED_NULL_PARAMETER); return(NULL); } @@ -401,14 +401,14 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split) if(!len) { - DSOerr(DSO_F_WIN32_MERGER, DSO_R_EMPTY_FILE_STRUCTURE); + DSOerr(DSO_F_WIN32_JOINER, DSO_R_EMPTY_FILE_STRUCTURE); return(NULL); } result = OPENSSL_malloc(len + 1); if (!result) { - DSOerr(DSO_F_WIN32_MERGER, + DSOerr(DSO_F_WIN32_JOINER, ERR_R_MALLOC_FAILURE); return(NULL); } |