Skip to content

Commit

Permalink
convert other errors (lsh123#71)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lsh123
lsh123 committed Dec 1, 2016
1 parent 55f6dee commit 5f6ce2c
Show file tree
Hide file tree
Showing 65 changed files with 554 additions and 1,036 deletions.
20 changes: 4 additions & 16 deletions apps/crypto.c
View file
Expand Up @@ -127,11 +127,7 @@ xmlSecAppCryptoSimpleKeysMngrKeyAndCertsLoad(xmlSecKeysMngrPtr mngr,
#else /* XMLSEC_NO_X509 */
files += strlen(files) + 1;
if(files[0] != '\0') {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"x509",
XMLSEC_ERRORS_R_DISABLED,
XMLSEC_ERRORS_NO_MESSAGE);
fprintf(stderr, "Error: X509 support is disabled\n");
return(-1);
}
#endif /* XMLSEC_NO_X509 */
Expand Down Expand Up @@ -183,11 +179,7 @@ xmlSecAppCryptoSimpleKeysMngrPkcs12KeyLoad(xmlSecKeysMngrPtr mngr, const char *f

return(0);
#else /* XMLSEC_NO_X509 */
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"x509",
XMLSEC_ERRORS_R_DISABLED,
XMLSEC_ERRORS_NO_MESSAGE);
fprintf(stderr, "Error: X509 support is disabled\n");
return(-1);
#endif /* XMLSEC_NO_X509 */
}
Expand Down Expand Up @@ -281,11 +273,7 @@ xmlSecAppCryptoKeyGenerate(const char* keyKlassAndSize, const char* name, xmlSec
/* separate key klass and size */
p = strchr(buf, '-');
if(p == NULL) {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
NULL,
XMLSEC_ERRORS_R_INVALID_DATA,
"key size is not specified %s",
fprintf(stderr, "Error: key size is not specified in the key definition \"%s\"\n",
xmlSecErrorsSafeString(buf));
xmlFree(buf);
return(NULL);
Expand All @@ -295,7 +283,7 @@ xmlSecAppCryptoKeyGenerate(const char* keyKlassAndSize, const char* name, xmlSec

key = xmlSecKeyGenerateByName(BAD_CAST buf, size, type);
if(key == NULL) {
fprintf(stderr, "Error: xmlSecKeyGenerate failed: name=%s;size=%d;type=%d\n",
fprintf(stderr, "Error: xmlSecKeyGenerateByName() failed: name=%s;size=%d;type=%d\n",
xmlSecErrorsSafeString(buf), size, (int)type);
xmlFree(buf);
return(NULL);
Expand Down
2 changes: 1 addition & 1 deletion include/xmlsec/errors.h
View file
Expand Up @@ -200,7 +200,7 @@ extern "C" {
/**
* XMLSEC_ERRORS_R_INVALID_TRANSFORM:
*
* This transform is invlaid here.
* This transform is invalid.
*/
#define XMLSEC_ERRORS_R_INVALID_TRANSFORM 31

Expand Down
6 changes: 1 addition & 5 deletions src/base64.c
View file
Expand Up @@ -939,11 +939,7 @@ xmlSecBase64Execute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPt
xmlSecAssert2(xmlSecBufferGetSize(in) == 0, -1);
break;
default:
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
NULL,
XMLSEC_ERRORS_R_INVALID_STATUS,
"status=%d", transform->status);
xmlSecInvalidTransfromStatusError(transform);
return(-1);
}
return(0);
Expand Down
17 changes: 2 additions & 15 deletions src/buffer.c
View file
Expand Up @@ -13,7 +13,6 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>

#include <libxml/tree.h>

Expand Down Expand Up @@ -446,13 +445,7 @@ xmlSecBufferReadFile(xmlSecBufferPtr buf, const char* filename) {

f = fopen(filename, "rb");
if(f == NULL) {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"fopen",
XMLSEC_ERRORS_R_IO_FAILED,
"filename=%s;errno=%d",
xmlSecErrorsSafeString(filename),
errno);
xmlSecIOError("fopen", filename, NULL);
return(-1);
}

Expand All @@ -461,13 +454,7 @@ xmlSecBufferReadFile(xmlSecBufferPtr buf, const char* filename) {
if(len == 0) {
break;
}else if(len < 0) {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"fread",
XMLSEC_ERRORS_R_IO_FAILED,
"filename=%s;errno=%d",
xmlSecErrorsSafeString(filename),
errno);
xmlSecIOError("fread", filename, NULL);
fclose(f);
return(-1);
}
Expand Down
19 changes: 4 additions & 15 deletions src/c14n.c
View file
Expand Up @@ -203,11 +203,7 @@ xmlSecTransformC14NPushXml(xmlSecTransformPtr transform, xmlSecNodeSetPtr nodes,
case xmlSecTransformStatusFinished:
return(0);
default:
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
NULL,
XMLSEC_ERRORS_R_INVALID_STATUS,
"status=%d", transform->status);
xmlSecInvalidTransfromStatusError(transform);
return(-1);
}
xmlSecAssert2(transform->status == xmlSecTransformStatusWorking, -1);
Expand Down Expand Up @@ -344,11 +340,7 @@ xmlSecTransformC14NPopBin(xmlSecTransformPtr transform, xmlSecByte* data,
xmlSecAssert2(xmlSecBufferGetSize(out) == 0, -1);
(*dataSize) = 0;
} else {
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
NULL,
XMLSEC_ERRORS_R_INVALID_STATUS,
"status=%d", transform->status);
xmlSecInvalidTransfromStatusError(transform);
return(-1);
}

Expand Down Expand Up @@ -394,11 +386,8 @@ xmlSecTransformC14NExecute(xmlSecTransformId id, xmlSecNodeSetPtr nodes, xmlChar
ret = xmlSecNodeSetDumpTextNodes(nodes, buf);
} else {
/* shoudn't be possible to come here, actually */
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecTransformKlassGetName(id)),
NULL,
XMLSEC_ERRORS_R_INVALID_TRANSFORM,
XMLSEC_ERRORS_NO_MESSAGE);
xmlSecOtherError(XMLSEC_ERRORS_R_INVALID_TRANSFORM,
xmlSecTransformKlassGetName(id), NULL);
return(-1);
}

Expand Down
52 changes: 8 additions & 44 deletions src/dl.c
View file
Expand Up @@ -127,12 +127,7 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) {
#ifdef XMLSEC_DL_LIBLTDL
lib->handle = lt_dlopenext((char*)lib->filename);
if(lib->handle == NULL) {
xmlSecError(XMLSEC_ERRORS_HERE,
"lt_dlopenext",
NULL,
XMLSEC_ERRORS_R_IO_FAILED,
"filename=%s",
xmlSecErrorsSafeString(lib->filename));
xmlSecIOError("lt_dlopenext", lib->filename, NULL);
xmlSecCryptoDLLibraryDestroy(lib);
return(NULL);
}
Expand All @@ -141,12 +136,7 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) {
lt_dlsym(lib->handle, (char*)lib->getFunctionsName)
);
if(getFunctions == NULL) {
xmlSecError(XMLSEC_ERRORS_HERE,
"lt_dlsym",
NULL,
XMLSEC_ERRORS_R_IO_FAILED,
"function=%s",
xmlSecErrorsSafeString(lib->getFunctionsName));
xmlSecIOError("lt_dlsym", lib->getFunctionsName, NULL);
xmlSecCryptoDLLibraryDestroy(lib);
return(NULL);
}
Expand All @@ -155,12 +145,7 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) {
#ifdef XMLSEC_DL_WIN32
lib->handle = LoadLibraryA((char*)lib->filename);
if(lib->handle == NULL) {
xmlSecError(XMLSEC_ERRORS_HERE,
"LoadLibraryA",
NULL,
XMLSEC_ERRORS_R_IO_FAILED,
"filename=%s",
xmlSecErrorsSafeString(lib->filename));
xmlSecIOError("LoadLibraryA", lib->filename, NULL);
xmlSecCryptoDLLibraryDestroy(lib);
return(NULL);
}
Expand All @@ -172,12 +157,7 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) {
)
);
if(getFunctions == NULL) {
xmlSecError(XMLSEC_ERRORS_HERE,
"GetProcAddressA",
NULL,
XMLSEC_ERRORS_R_IO_FAILED,
"function=%s",
xmlSecErrorsSafeString(lib->getFunctionsName));
xmlSecIOError("GetProcAddressA", lib->getFunctionsName, NULL);
xmlSecCryptoDLLibraryDestroy(lib);
return(NULL);
}
Expand Down Expand Up @@ -223,11 +203,7 @@ xmlSecCryptoDLLibraryDestroy(xmlSecCryptoDLLibraryPtr lib) {

ret = lt_dlclose(lib->handle);
if(ret != 0) {
xmlSecError(XMLSEC_ERRORS_HERE,
"lt_dlclose",
NULL,
XMLSEC_ERRORS_R_IO_FAILED,
XMLSEC_ERRORS_NO_MESSAGE);
xmlSecIOError("lt_dlclose", NULL, NULL);
}
}
#endif /* XMLSEC_DL_LIBLTDL */
Expand All @@ -238,11 +214,7 @@ xmlSecCryptoDLLibraryDestroy(xmlSecCryptoDLLibraryPtr lib) {

res = FreeLibrary(lib->handle);
if(!res) {
xmlSecError(XMLSEC_ERRORS_HERE,
"FreeLibrary",
NULL,
XMLSEC_ERRORS_R_IO_FAILED,
XMLSEC_ERRORS_NO_MESSAGE);
xmlSecIOError("FreeLibrary", NULL, NULL);
}
}
#endif /* XMLSEC_DL_WIN32*/
Expand Down Expand Up @@ -352,11 +324,7 @@ xmlSecCryptoDLInit(void) {
#ifdef XMLSEC_DL_LIBLTDL
ret = lt_dlinit ();
if(ret != 0) {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"lt_dlinit",
XMLSEC_ERRORS_R_IO_FAILED,
XMLSEC_ERRORS_NO_MESSAGE);
xmlSecIOError("lt_dlinit", NULL, NULL);
return(-1);
}
#endif /* XMLSEC_DL_LIBLTDL */
Expand All @@ -382,11 +350,7 @@ xmlSecCryptoDLShutdown(void) {
#ifdef XMLSEC_DL_LIBLTDL
ret = lt_dlexit ();
if(ret != 0) {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"lt_dlexit",
XMLSEC_ERRORS_R_IO_FAILED,
XMLSEC_ERRORS_NO_MESSAGE);
xmlSecIOError("lt_dlexit", NULL, NULL);
}
#endif /* XMLSEC_DL_LIBLTDL */

Expand Down
8 changes: 3 additions & 5 deletions src/enveloped.c
View file
Expand Up @@ -106,11 +106,9 @@ xmlSecTransformEnvelopedExecute(xmlSecTransformPtr transform, int last,
xmlSecAssert2(transformCtx != NULL, -1);

if((transform->inNodes != NULL) && (transform->inNodes->doc != transform->hereNode->doc)) {
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
NULL,
XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED,
XMLSEC_ERRORS_NO_MESSAGE);
xmlSecOtherError(XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED,
xmlSecTransformGetName(transform),
NULL);
return(-1);
}

Expand Down

0 comments on commit 5f6ce2c

Please sign in to comment.