unix runmode: use unlikely for memory error

pull/215/head
Eric Leblond 13 years ago
parent 547c55114e
commit 028a37f6e7

@ -145,14 +145,14 @@ TmEcode UnixListAddFile(PcapCommand *this, const char *filename, const char *out
if (filename == NULL || this == NULL) if (filename == NULL || this == NULL)
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
cfile = SCMalloc(sizeof(PcapFiles)); cfile = SCMalloc(sizeof(PcapFiles));
if (cfile == NULL) { if (unlikely(cfile == NULL)) {
SCLogError(SC_ERR_MEM_ALLOC, "Unable to allocate new file"); SCLogError(SC_ERR_MEM_ALLOC, "Unable to allocate new file");
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
} }
memset(cfile, 0, sizeof(PcapFiles)); memset(cfile, 0, sizeof(PcapFiles));
cfile->filename = SCStrdup(filename); cfile->filename = SCStrdup(filename);
if (cfile->filename == NULL) { if (unlikely(cfile->filename == NULL)) {
SCFree(cfile); SCFree(cfile);
SCLogError(SC_ERR_MEM_ALLOC, "Unable to dup filename"); SCLogError(SC_ERR_MEM_ALLOC, "Unable to dup filename");
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
@ -160,7 +160,7 @@ TmEcode UnixListAddFile(PcapCommand *this, const char *filename, const char *out
if (output_dir) { if (output_dir) {
cfile->output_dir = SCStrdup(output_dir); cfile->output_dir = SCStrdup(output_dir);
if (cfile->output_dir == NULL) { if (unlikely(cfile->output_dir == NULL)) {
SCFree(cfile->filename); SCFree(cfile->filename);
SCFree(cfile); SCFree(cfile);
SCLogError(SC_ERR_MEM_ALLOC, "Unable to dup output_dir"); SCLogError(SC_ERR_MEM_ALLOC, "Unable to dup output_dir");
@ -349,7 +349,7 @@ int RunModeUnixSocketSingle(DetectEngineCtx *de_ctx)
#ifdef BUILD_UNIX_SOCKET #ifdef BUILD_UNIX_SOCKET
PcapCommand *pcapcmd = SCMalloc(sizeof(PcapCommand)); PcapCommand *pcapcmd = SCMalloc(sizeof(PcapCommand));
if (pcapcmd == NULL) { if (unlikely(pcapcmd == NULL)) {
SCLogError(SC_ERR_MEM_ALLOC, "Can not allocate pcap command"); SCLogError(SC_ERR_MEM_ALLOC, "Can not allocate pcap command");
return 1; return 1;
} }

Loading…
Cancel
Save