c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang-tidy: move assignments out of if

Browse Source 
Found with bugprone-assignment-in-if-condition

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2024-06-18 13:55:34 -07:00
parent 5803ad26b5
commit 2def7b4b28
12 changed files with 53 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
catalog.c
View File

@ -959,9 +959,11 @@ xmlLoadFileContent(const char *filename)
#endif #endif
#ifdef HAVE_STAT #ifdef HAVE_STAT
if ((fd = open(filename, O_RDONLY)) < 0) fd = open(filename, O_RDONLY);
if (fd < 0)
#else #else
if ((fd = fopen(filename, "rb")) == NULL) fd = fopen(filename, "rb");
if (fd == NULL)
#endif #endif
{ {
return (NULL); return (NULL);

3
encoding.c
View File

@ -377,7 +377,8 @@ UTF8Toisolat1(unsigned char* out, int *outlen,
for ( ; trailing; trailing--) { for ( ; trailing; trailing--) {
if (in >= inend) if (in >= inend)
break; break;
if (((d= *in++) & 0xC0) != 0x80) { d = *in++;
if ((d & 0xC0) != 0x80) {
*outlen = out - outstart; *outlen = out - outstart;
*inlen = processed - instart; *inlen = processed - instart;
return(XML_ENC_ERR_INPUT); return(XML_ENC_ERR_INPUT);

15
list.c
View File

@ -188,13 +188,15 @@ xmlListPtr
xmlListCreate(xmlListDeallocator deallocator, xmlListDataCompare compare) xmlListCreate(xmlListDeallocator deallocator, xmlListDataCompare compare)
{ {
xmlListPtr l; xmlListPtr l;
if (NULL == (l = (xmlListPtr )xmlMalloc( sizeof(xmlList)))) l = (xmlListPtr)xmlMalloc(sizeof(xmlList));
if (l == NULL)
return (NULL); return (NULL);
/* Initialize the list to NULL */ /* Initialize the list to NULL */
memset(l, 0, sizeof(xmlList)); memset(l, 0, sizeof(xmlList));
/* Add the sentinel */ /* Add the sentinel */
if (NULL ==(l->sentinel = (xmlLinkPtr )xmlMalloc(sizeof(xmlLink)))) { l->sentinel = (xmlLinkPtr)xmlMalloc(sizeof(xmlLink));
if (l->sentinel == NULL) {
xmlFree(l); xmlFree(l);
return (NULL); return (NULL);
} }
@ -565,7 +567,8 @@ xmlListPushBack(xmlListPtr l, void *data)
return(0); return(0);
lkPlace = l->sentinel->prev; lkPlace = l->sentinel->prev;
/* Add the new link */ /* Add the new link */
if (NULL ==(lkNew = (xmlLinkPtr )xmlMalloc(sizeof(xmlLink)))) lkNew = (xmlLinkPtr)xmlMalloc(sizeof(xmlLink));
if (lkNew == NULL)
return (0); return (0);
lkNew->data = data; lkNew->data = data;
lkNew->next = lkPlace->next; lkNew->next = lkPlace->next;
@ -638,7 +641,8 @@ xmlListSort(xmlListPtr l)
* an insert. This is slow... * an insert. This is slow...
*/ */
if (NULL ==(lTemp = xmlListDup(l))) lTemp = xmlListDup(l);
if (lTemp == NULL)
return; return;
xmlListClear(l); xmlListClear(l);
xmlListMerge(l, lTemp); xmlListMerge(l, lTemp);
@ -723,7 +727,8 @@ xmlListDup(xmlListPtr old)
* set it to be the old list for the time being whilst I work out * set it to be the old list for the time being whilst I work out
* the answer * the answer
*/ */
if (NULL ==(cur = xmlListCreate(NULL, old->linkCompare))) cur = xmlListCreate(NULL, old->linkCompare);
if (cur == NULL)
return (NULL); return (NULL);
if (0 != xmlListCopy(cur, old)) if (0 != xmlListCopy(cur, old))
return NULL; return NULL;

3
runtest.c
View File

@ -480,7 +480,8 @@ static int loadMem(const char *filename, const char **mem, int *size) {
base = malloc(info.st_size + 1); base = malloc(info.st_size + 1);
if (base == NULL) if (base == NULL)
return(-1); return(-1);
if ((fd = open(filename, RD_FLAGS)) < 0) { fd = open(filename, RD_FLAGS);
if (fd < 0) {
free(base); free(base);
return(-1); return(-1);
} }

6
threads.c
View File

@ -92,7 +92,8 @@ xmlNewMutex(void)
{ {
xmlMutexPtr tok; xmlMutexPtr tok;
if ((tok = malloc(sizeof(xmlMutex))) == NULL) tok = malloc(sizeof(xmlMutex));
if (tok == NULL)
return (NULL); return (NULL);
xmlInitMutex(tok); xmlInitMutex(tok);
return (tok); return (tok);
@ -188,7 +189,8 @@ xmlNewRMutex(void)
{ {
xmlRMutexPtr tok; xmlRMutexPtr tok;
if ((tok = malloc(sizeof(xmlRMutex))) == NULL) tok = malloc(sizeof(xmlRMutex));
if (tok == NULL)
return (NULL); return (NULL);
#ifdef HAVE_POSIX_THREADS #ifdef HAVE_POSIX_THREADS
pthread_mutex_init(&tok->lock, NULL); pthread_mutex_init(&tok->lock, NULL);

9
valid.c
View File

@ -673,7 +673,8 @@ done:
xmlValidCtxtPtr xmlNewValidCtxt(void) { xmlValidCtxtPtr xmlNewValidCtxt(void) {
xmlValidCtxtPtr ret; xmlValidCtxtPtr ret;
if ((ret = xmlMalloc(sizeof (xmlValidCtxt))) == NULL) ret = xmlMalloc(sizeof (xmlValidCtxt));
if (ret == NULL)
return (NULL); return (NULL);
(void) memset(ret, 0, sizeof (xmlValidCtxt)); (void) memset(ret, 0, sizeof (xmlValidCtxt));
@ -2752,10 +2753,12 @@ xmlAddRef(xmlValidCtxtPtr ctxt, xmlDocPtr doc, const xmlChar *value,
* Return the ref * Return the ref
*/ */
if (NULL == (ref_list = xmlHashLookup(table, value))) { ref_list = xmlHashLookup(table, value);
if (ref_list == NULL) {
int res; int res;
if (NULL == (ref_list = xmlListCreate(xmlFreeRef, xmlDummyCompare))) ref_list = xmlListCreate(xmlFreeRef, xmlDummyCompare);
if (ref_list == NULL)
goto failed; goto failed;
res = xmlHashAdd(table, value, ref_list); res = xmlHashAdd(table, value, ref_list);
if (res <= 0) { if (res <= 0) {

15
xmllint.c
View File

@ -1594,7 +1594,8 @@ static void streamFile(const char *filename) {
if (memory) { if (memory) {
if (stat(filename, &info) < 0) if (stat(filename, &info) < 0)
return; return;
if ((fd = open(filename, O_RDONLY)) < 0) fd = open(filename, O_RDONLY);
if (fd < 0)
return; return;
base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ; base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ;
if (base == (void *) MAP_FAILED) { if (base == (void *) MAP_FAILED) {
@ -2017,7 +2018,8 @@ parseFile(const char *filename, xmlParserCtxtPtr rectxt) {
const char *base; const char *base;
if (stat(filename, &info) < 0) if (stat(filename, &info) < 0)
return(NULL); return(NULL);
if ((fd = open(filename, O_RDONLY)) < 0) fd = open(filename, O_RDONLY);
if (fd < 0)
return(NULL); return(NULL);
base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ; base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ;
if (base == (void *) MAP_FAILED) { if (base == (void *) MAP_FAILED) {
@ -2147,7 +2149,8 @@ parseFile(const char *filename, xmlParserCtxtPtr rectxt) {
if (stat(filename, &info) < 0) if (stat(filename, &info) < 0)
goto error; goto error;
if ((fd = open(filename, O_RDONLY)) < 0) fd = open(filename, O_RDONLY);
if (fd < 0)
goto error; goto error;
base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ; base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ;
if (base == (void *) MAP_FAILED) { if (base == (void *) MAP_FAILED) {
@ -2528,7 +2531,8 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
} else { } else {
xmlValidCtxtPtr cvp; xmlValidCtxtPtr cvp;
if ((cvp = xmlNewValidCtxt()) == NULL) { cvp = xmlNewValidCtxt();
if (cvp == NULL) {
fprintf(ERR_STREAM, fprintf(ERR_STREAM,
"Couldn't allocate validation context\n"); "Couldn't allocate validation context\n");
progresult = XMLLINT_ERR_MEM; progresult = XMLLINT_ERR_MEM;
@ -2559,7 +2563,8 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
} else if (postvalid) { } else if (postvalid) {
xmlValidCtxtPtr cvp; xmlValidCtxtPtr cvp;
if ((cvp = xmlNewValidCtxt()) == NULL) { cvp = xmlNewValidCtxt();
if (cvp == NULL) {
fprintf(ERR_STREAM, fprintf(ERR_STREAM,
"Couldn't allocate validation context\n"); "Couldn't allocate validation context\n");
progresult = XMLLINT_ERR_MEM; progresult = XMLLINT_ERR_MEM;

3
xmlsave.c
View File

@ -2675,7 +2675,8 @@ xmlDocDumpFormatMemoryEnc(xmlDocPtr out_doc, xmlChar **doc_txt_ptr,
} }
} }
if ((out_buff = xmlAllocOutputBuffer(conv_hdlr)) == NULL ) { out_buff = xmlAllocOutputBuffer(conv_hdlr);
if (out_buff == NULL ) {
xmlSaveErrMemory(NULL); xmlSaveErrMemory(NULL);
xmlCharEncCloseFunc(conv_hdlr); xmlCharEncCloseFunc(conv_hdlr);
return; return;

7
xmlstring.c
View File

@ -994,7 +994,8 @@ xmlUTF8Strsize(const xmlChar *utf, int len) {
while ( len-- > 0) { while ( len-- > 0) {
if ( !*ptr ) if ( !*ptr )
break; break;
if ( (ch = *ptr++) & 0x80) ch = *ptr++;
if ((ch & 0x80))
while ((ch<<=1) & 0x80 ) { while ((ch<<=1) & 0x80 ) {
if (*ptr == 0) break; if (*ptr == 0) break;
ptr++; ptr++;
@ -1048,7 +1049,9 @@ xmlUTF8Strpos(const xmlChar *utf, int pos) {
if (pos < 0) if (pos < 0)
return(NULL); return(NULL);
while (pos--) { while (pos--) {
if ((ch=*utf++) == 0) return(NULL); ch = *utf++;
if (ch == 0)
return(NULL);
if ( ch & 0x80 ) { if ( ch & 0x80 ) {
/* if not simple ascii, verify proper format */ /* if not simple ascii, verify proper format */
if ( (ch & 0xc0) != 0xc0 ) if ( (ch & 0xc0) != 0xc0 )

3
xmlunicode.c
View File

@ -954,7 +954,8 @@ static xmlIntFunc
sptr = tptr->table; sptr = tptr->table;
while (low <= high) { while (low <= high) {
mid = (low + high) / 2; mid = (low + high) / 2;
if ((cmp=strcmp(tname, sptr[mid].rangename)) == 0) cmp = strcmp(tname, sptr[mid].rangename);
if (cmp == 0)
return (sptr[mid].func); return (sptr[mid].func);
if (cmp < 0) if (cmp < 0)
high = mid - 1; high = mid - 1;

6
xmlwriter.c
View File

@ -4439,7 +4439,8 @@ xmlTextWriterWriteDocCallback(void *context, const char *str, int len)
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) context; xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) context;
int rc; int rc;
if ((rc = xmlParseChunk(ctxt, str, len, 0)) != 0) { rc = xmlParseChunk(ctxt, str, len, 0);
if (rc != 0) {
xmlWriterErrMsgInt(NULL, XML_ERR_INTERNAL_ERROR, xmlWriterErrMsgInt(NULL, XML_ERR_INTERNAL_ERROR,
"xmlTextWriterWriteDocCallback : XML error %d !\n", "xmlTextWriterWriteDocCallback : XML error %d !\n",
rc); rc);
@ -4463,7 +4464,8 @@ xmlTextWriterCloseDocCallback(void *context)
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) context; xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) context;
int rc; int rc;
if ((rc = xmlParseChunk(ctxt, NULL, 0, 1)) != 0) { rc = xmlParseChunk(ctxt, NULL, 0, 1);
if (rc != 0) {
xmlWriterErrMsgInt(NULL, XML_ERR_INTERNAL_ERROR, xmlWriterErrMsgInt(NULL, XML_ERR_INTERNAL_ERROR,
"xmlTextWriterCloseDocCallback : XML error %d !\n", "xmlTextWriterCloseDocCallback : XML error %d !\n",
rc); rc);

4
xzlib.c
View File

@ -101,8 +101,8 @@ xz_error(xz_statep state, int err, const char *msg)
} }
/* construct error message with path */ /* construct error message with path */
if ((state->msg = state->msg = xmlMalloc(strlen(state->path) + strlen(msg) + 3);
xmlMalloc(strlen(state->path) + strlen(msg) + 3)) == NULL) { if (state->msg == NULL) {
state->err = LZMA_MEM_ERROR; state->err = LZMA_MEM_ERROR;
state->msg = (char *) "out of memory"; state->msg = (char *) "out of memory";
return; return;