From: Enlightenment S. <no-...@en...> - 2010-08-13 17:04:25
|
Log: Apply badzero.cocci, badnull.cocci and badnull2.cocci Since badzero.cocci depends on coccinelle knowledge about a variable being a pointer and about a function returning a pointer, maybe there are false negatives. Author: lucas Date: 2010-08-13 10:04:13 -0700 (Fri, 13 Aug 2010) New Revision: 51092 Modified: trunk/E16/e/dox/dox.c trunk/E16/e/dox/text.c trunk/E16/e/dox/ttfont.c trunk/E16/e/eesh/main.c trunk/E16/e/epp/cppalloc.c trunk/E16/e/epp/cpperror.c trunk/E16/e/epp/cppexp.c trunk/E16/e/epp/cpphash.c trunk/E16/e/epp/cpplib.c trunk/E16/e/src/arrange.c trunk/E16/e/src/backgrounds.c trunk/E16/e/src/borders.c trunk/E16/e/src/config.c trunk/E16/e/src/coords.c trunk/E16/e/src/e16-ecore_list.c trunk/E16/e/src/econfig.c trunk/E16/e/src/eobj.c trunk/E16/e/src/ewin-ops.c trunk/E16/e/src/file.c trunk/E16/e/src/finders.c trunk/E16/e/src/focus.c trunk/E16/e/src/iclass.c trunk/E16/e/src/iconify.c trunk/E16/e/src/ipc.c trunk/E16/e/src/lang.c trunk/E16/e/src/main.c trunk/E16/e/src/menus.c trunk/E16/e/src/snaps.c trunk/E16/e/src/snprintf.c trunk/E16/e/src/startup.c trunk/E16/e/src/systray.c trunk/E16/e/src/theme.c trunk/E16/e/src/tooltips.c trunk/E16/e16menuedit/src/callbacks.c trunk/E16/e16menuedit/src/e16menu.c trunk/E16/e16menuedit/src/e16menuedit2.c trunk/E16/e16menuedit/src/file.c trunk/E16/e16menuedit/src/icon_chooser.c trunk/E16/e16menuedit/src/treeview.c trunk/E16/epplets/api/epplet.c trunk/E16/epplets/api/snprintf.c trunk/E16/epplets/epplets/E-Biff.c trunk/E16/epplets/epplets/E-Disk.c trunk/E16/epplets/epplets/E-Magic.c trunk/E16/epplets/epplets/E-MemWatch.c trunk/E16/epplets/epplets/E-Mountbox.c trunk/E16/epplets/epplets/E-OpenGL-Demo.c trunk/E16/epplets/epplets/E-Pants.c trunk/E16/epplets/epplets/E-Pinger.c trunk/E16/epplets/epplets/E-ScreenShoot_ftp.c trunk/E16/epplets/epplets/E-Slides.c trunk/E16/epplets/epplets/E-Sys.c trunk/E16/epplets/epplets/E-Toolbox.c trunk/E16/epplets/epplets/E-UrlWatch.c trunk/E16/epplets/epplets/load.c trunk/E16/epplets/epplets/mbox.c trunk/E16/epplets/epplets/net.c trunk/E16/epplets/epplets/utils.c Modified: trunk/E16/e/dox/dox.c =================================================================== --- trunk/E16/e/dox/dox.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/dox/dox.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -322,7 +322,7 @@ else docdir = strdup(argv[i]); } - if (docdir == NULL) + if (!docdir) docdir = strdup(doxdir); s = EMALLOC(char, strlen(docdir) + strlen(docfile) + 2 + 20); @@ -342,7 +342,7 @@ LoadFile(s, docfile); - if ((disp = XOpenDisplay(NULL)) == NULL) + if (!(disp = XOpenDisplay(NULL))) { printf("%s: Cannot open X display.\n", argv[0]); exit(0); Modified: trunk/E16/e/dox/text.c =================================================================== --- trunk/E16/e/dox/text.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/dox/text.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -99,7 +99,7 @@ } #if USE_XFONT - if ((!ts->xfont) && (strchr(ts->fontname, ',') == NULL)) + if ((!ts->xfont) && (!strchr(ts->fontname, ','))) { ts->xfont = XLoadQueryFont(disp, ts->fontname); if (ts->xfont) Modified: trunk/E16/e/dox/ttfont.c =================================================================== --- trunk/E16/e/dox/ttfont.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/dox/ttfont.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -98,7 +98,7 @@ Esnprintf(s, sizeof(s), "%s/%d", file, size); ff = imlib_load_font(s); - if (ff == NULL) + if (!ff) return NULL; f = EMALLOC(Efont, 1); Modified: trunk/E16/e/eesh/main.c =================================================================== --- trunk/E16/e/eesh/main.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/eesh/main.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -35,7 +35,7 @@ static void process_line(char *line) { - if (line == NULL) + if (!line) exit(0); if (*line == '\0') return; @@ -166,7 +166,7 @@ /* CommsSend(e, "set pixmap 0"); */ #endif - if (command == NULL && i < argc) + if (!command && i < argc) { mode = 1; len = 0; Modified: trunk/E16/e/epp/cppalloc.c =================================================================== --- trunk/E16/e/epp/cppalloc.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/epp/cppalloc.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -37,7 +37,7 @@ { char *ptr = (char *)malloc(size); - if (ptr != NULL) + if (ptr) return (ptr); memory_full(); /*NOTREACHED */ @@ -49,7 +49,7 @@ { char *ptr = (char *)realloc(old, size); - if (ptr == NULL) + if (!ptr) memory_full(); return ptr; } @@ -59,7 +59,7 @@ { char *ptr = (char *)calloc(number, size); - if (ptr == NULL) + if (!ptr) memory_full(); return ptr; } Modified: trunk/E16/e/epp/cpperror.c =================================================================== --- trunk/E16/e/epp/cpperror.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/epp/cpperror.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -44,7 +44,7 @@ ip = cpp_file_buffer(pfile); /* Give up if we don't find a source file. */ - if (ip == NULL) + if (!ip) return; /* Find the other, outer source files. */ @@ -53,7 +53,7 @@ long line, col; cpp_buf_line_and_col(ip, &line, &col); - if (ip->fname != NULL) + if (ip->fname) { if (first) { Modified: trunk/E16/e/epp/cppexp.c =================================================================== --- trunk/E16/e/epp/cppexp.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/epp/cppexp.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -300,7 +300,7 @@ case CPP_VSPACE: case CPP_POP: - if (CPP_BUFFER(pfile)->fname != NULL) + if (CPP_BUFFER(pfile)->fname) { op->op = 0; break; @@ -449,7 +449,7 @@ /* See if it is a special token of length 2. */ if (tok_start + 2 == tok_end) { - for (toktab = tokentab2; toktab->oper != NULL; toktab++) + for (toktab = tokentab2; toktab->oper; toktab++) if (tok_start[0] == toktab->oper[0] && tok_start[1] == toktab->oper[1]) break; Modified: trunk/E16/e/epp/cpphash.c =================================================================== --- trunk/E16/e/epp/cpphash.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/epp/cpphash.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -101,9 +101,9 @@ delete_macro(HASHNODE * hp) { - if (hp->prev != NULL) + if (hp->prev) hp->prev->next = hp->next; - if (hp->next != NULL) + if (hp->next) hp->next->prev = hp->prev; /* make sure that the bucket chain header that @@ -116,7 +116,7 @@ DEFINITION *d = hp->value.defn; struct reflist *ap, *nextap; - for (ap = d->pattern; ap != NULL; ap = nextap) + for (ap = d->pattern; ap; ap = nextap) { nextap = ap->next; free(ap); @@ -166,7 +166,7 @@ hp->next = hashtab[bucket]; hashtab[bucket] = hp; hp->prev = NULL; - if (hp->next != NULL) + if (hp->next) hp->next->prev = hp; hp->type = type; hp->length = len; Modified: trunk/E16/e/epp/cpplib.c =================================================================== --- trunk/E16/e/epp/cpplib.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/epp/cpplib.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -690,12 +690,12 @@ if (!first || !last) return; - if (opts->include == NULL) + if (!opts->include) opts->include = first; else opts->last_include->next = first; - if (opts->first_bracket_include == NULL) + if (!opts->first_bracket_include) opts->first_bracket_include = first; for (dir = first;; dir = dir->next) @@ -1385,7 +1385,7 @@ { struct arglist *arg; - for (arg = arglist; arg != NULL; arg = arg->next) + for (arg = arglist; arg; arg = arg->next) { reflist *tpat; @@ -1425,7 +1425,7 @@ ? expected_delimiter != '\0' : stringify == id_beg); - if (endpat == NULL) + if (!endpat) defn->pattern = tpat; else endpat->next = tpat; @@ -1596,7 +1596,7 @@ { struct arglist *otemp; - for (otemp = temp->next; otemp != NULL; otemp = otemp->next) + for (otemp = temp->next; otemp; otemp = otemp->next) if (temp->length == otemp->length && strncmp((const char *)temp->name, (const char *)otemp->name, temp->length) == 0) @@ -1632,7 +1632,7 @@ { memcpy(&defn->args.argnames[i], temp->name, temp->length); i += temp->length; - if (temp->next != NULL) + if (temp->next) { defn->args.argnames[i++] = ','; defn->args.argnames[i++] = ' '; @@ -1851,13 +1851,13 @@ MACRODEF mdef; HASHNODE *hp; - create_definition(&mdef, buf, limit, pfile, keyword == NULL); - if (mdef.defn == NULL) + create_definition(&mdef, buf, limit, pfile, !keyword); + if (!mdef.defn) return 1; hashcode = hashf(mdef.symnam, mdef.symlen, HASHSIZE); - if ((hp = cpp_lookup(mdef.symnam, mdef.symlen, hashcode)) != NULL) + if ((hp = cpp_lookup(mdef.symnam, mdef.symlen, hashcode))) { int ok = 0; @@ -2061,7 +2061,7 @@ unsigned char *new_pos = pbuf->cur; struct parse_marker *mark; - for (mark = pbuf->marks; mark != NULL; mark = mark->next) + for (mark = pbuf->marks; mark; mark = mark->next) { if (pbuf->buf + mark->position < new_pos) new_pos = pbuf->buf + mark->position; @@ -2075,7 +2075,7 @@ { long dummy; - if (colp == NULL) + if (!colp) colp = &dummy; if (pbuf) { @@ -2098,7 +2098,7 @@ cpp_buffer *ip = CPP_BUFFER(pfile); for (; ip != CPP_NULL_BUFFER(pfile); ip = CPP_PREV_BUFFER(ip)) - if (ip->fname != NULL) + if (ip->fname) return ip; return NULL; } @@ -2134,7 +2134,7 @@ cpp_buffer *ip = CPP_BUFFER(pfile); if (CPP_OPTIONS(pfile)->no_line_commands - || ip->fname == NULL || CPP_OPTIONS(pfile)->no_output) + || !ip->fname || CPP_OPTIONS(pfile)->no_output) { return; } @@ -2342,12 +2342,12 @@ for (ip = CPP_BUFFER(pfile);; ip = CPP_PREV_BUFFER(ip)) { - if (ip == NULL) + if (!ip) { cpp_error(pfile, "cccp error: not in any file?!"); return; /* the show must go on */ } - if (ip->fname != NULL) + if (ip->fname) break; } @@ -2374,8 +2374,8 @@ case T_INCLUDE_LEVEL: true_indepth = 0; - for (ip = CPP_BUFFER(pfile); ip != NULL; ip = CPP_PREV_BUFFER(ip)) - if (ip->fname != NULL) + for (ip = CPP_BUFFER(pfile); ip; ip = CPP_PREV_BUFFER(ip)) + if (ip->fname) true_indepth++; bufx = (char *)alloca(8); /* Eight bytes ought to be more than enough */ @@ -2829,7 +2829,7 @@ /* Compute length in characters of the macro's expansion. * Also count number of times each arg is used. */ xbuf_len = defn->length; - for (ap = defn->pattern; ap != NULL; ap = ap->next) + for (ap = defn->pattern; ap; ap = ap->next) { if (ap->stringify) { @@ -2946,7 +2946,7 @@ * OFFSET is the index in the definition * of where we are copying from. */ offset = totlen = 0; - for (last_ap = NULL, ap = defn->pattern; ap != NULL; + for (last_ap = NULL, ap = defn->pattern; ap; last_ap = ap, ap = ap->next) { struct argdata *arg = &args[ap->argno]; @@ -2960,7 +2960,7 @@ * delete the last run of nonwhite chars. */ if (rest_zero && totlen > count_before && ((ap->rest_args && ap->raw_before) - || (last_ap != NULL && last_ap->rest_args + || (last_ap && last_ap->rest_args && last_ap->raw_after))) { /* Delete final whitespace. */ @@ -3066,7 +3066,7 @@ /* if we've reached the end of the macro */ if (exp[i] == ')') rest_zero = 0; - if (!(rest_zero && last_ap != NULL && last_ap->rest_args + if (!(rest_zero && last_ap && last_ap->rest_args && last_ap->raw_after)) xbuf[totlen++] = exp[i]; } @@ -3240,12 +3240,12 @@ /* We have "filename". Figure out directory this source * file is coming from and put it on the front of the list. */ - for (fp = CPP_BUFFER(pfile); fp != NULL; fp = CPP_PREV_BUFFER(fp)) + for (fp = CPP_BUFFER(pfile); fp; fp = CPP_PREV_BUFFER(fp)) { int n; const char *ep, *nam; - if ((nam = fp->nominal_fname) != NULL) + if ((nam = fp->nominal_fname)) { /* Found a named file. Figure out dir of the file, * and put it in front of the search list. */ @@ -3255,14 +3255,14 @@ ep = strrchr(nam, '/'); #else /* VMS */ ep = strrchr(nam, ']'); - if (ep == NULL) + if (!ep) ep = strrchr(nam, '>'); - if (ep == NULL) + if (!ep) ep = strrchr(nam, ':'); - if (ep != NULL) + if (ep) ep++; #endif /* VMS */ - if (ep != NULL) + if (ep) { n = ep - nam; dsp[0].fname = (char *)alloca(n + 1); @@ -3305,8 +3305,8 @@ { cpp_buffer *fp; - for (fp = CPP_BUFFER(pfile); fp != NULL; fp = CPP_PREV_BUFFER(fp)) - if (fp->fname != NULL) + for (fp = CPP_BUFFER(pfile); fp; fp = CPP_PREV_BUFFER(fp)) + if (fp->fname) { /* fp->dir is null if the containing file was specified with * an absolute file name. In that case, don't skip anything. */ @@ -3388,7 +3388,7 @@ strncpy(fname, fbeg, flen); fname[flen] = 0; /* if it's '#include filename', add the missing .h */ - if (strchr(fname, '.') == NULL) + if (!strchr(fname, '.')) { strcat(fname, ".h"); } @@ -3495,7 +3495,7 @@ break; /* This file was included before. */ } - if (ptr == NULL) + if (!ptr) { /* This is the first time for this file. */ /* Add it to list of files included. */ @@ -3519,7 +3519,7 @@ { cpp_buffer *buf = CPP_BUFFER(pfile); - while ((buf = CPP_PREV_BUFFER(buf)) != NULL) + while ((buf = CPP_PREV_BUFFER(buf))) putc('.', stderr); fprintf(stderr, "%s\n", fname); } @@ -3622,7 +3622,7 @@ hp->next = pfile->assertion_hashtab[bucket]; pfile->assertion_hashtab[bucket] = hp; hp->prev = NULL; - if (hp->next != NULL) + if (hp->next) hp->next->prev = hp; hp->length = len; hp->value = 0; @@ -3662,9 +3662,9 @@ { struct tokenlist_list *tail; - if (hp->prev != NULL) + if (hp->prev) hp->prev->next = hp->next; - if (hp->next != NULL) + if (hp->next) hp->next->prev = hp->prev; for (tail = hp->value; tail;) @@ -3783,7 +3783,7 @@ * into a null-terminated string. Do this in place. */ end_name = convert_string(pfile, fname, fname, (char *)CPP_PWRITTEN(pfile), 1); - if (end_name == NULL) + if (!end_name) { cpp_error(pfile, "invalid format `#line' command"); goto bad_line_directive; @@ -3828,14 +3828,14 @@ } } hash_bucket = &fname_table[hashf(fname, fname_length, FNAME_HASHSIZE)]; - for (hp = *hash_bucket; hp != NULL; hp = hp->next) + for (hp = *hash_bucket; hp; hp = hp->next) if (hp->length == fname_length && strncmp(hp->value.cpval, fname, fname_length) == 0) { ip->nominal_fname = hp->value.cpval; break; } - if (hp == NULL) + if (!hp) { /* Didn't find it; cons up a new one. */ hp = (HASHNODE *) xcalloc(1, sizeof(HASHNODE) + fname_length + 1); @@ -3878,7 +3878,7 @@ SKIP_WHITE_SPACE(buf); sym_length = check_macro_name(pfile, buf, "macro"); - while ((hp = cpp_lookup((const char *)buf, sym_length, -1)) != NULL) + while ((hp = cpp_lookup((const char *)buf, sym_length, -1))) { /* If we are generating additional info for debugging (with -g) we * need to pass through all effective #undef commands. */ @@ -3952,9 +3952,9 @@ for (ip = CPP_BUFFER(pfile);; ip = CPP_PREV_BUFFER(ip)) { - if (ip == NULL) + if (!ip) return 0; - if (ip->fname != NULL) + if (ip->fname) break; } @@ -4025,7 +4025,7 @@ fname = p + 1; p = strchr(fname, '\"'); fname_len = - (int)(((int)(p != NULL)) ? ((int)(p - fname)) + (int)(((int)(p)) ? ((int)(p - fname)) : ((int)(strlen(fname)))); for (ptr = pfile->all_include_files; ptr; ptr = ptr->next) @@ -4089,8 +4089,8 @@ if (pfile->if_stack->type != T_IF && pfile->if_stack->type != T_ELIF) { cpp_error(pfile, "`#elif' after `#else'"); - if (pfile->if_stack->fname != NULL - && CPP_BUFFER(pfile)->fname != NULL + if (pfile->if_stack->fname + && CPP_BUFFER(pfile)->fname && strcmp(pfile->if_stack->fname, CPP_BUFFER(pfile)->nominal_fname) != 0) fprintf(stderr, ", file %s", pfile->if_stack->fname); @@ -4184,7 +4184,7 @@ { HASHNODE *hp = cpp_lookup(ident, ident_length, -1); - skip = (hp == NULL) ^ (keyword->type == T_IFNDEF); + skip = (!hp) ^ (keyword->type == T_IFNDEF); if (start_of_file && !skip) { control_macro = (unsigned char *)xmalloc(ident_length + 1); @@ -4483,7 +4483,7 @@ IF_STACK_FRAME *temp = pfile->if_stack; pfile->if_stack = temp->next; - if (temp->control_macro != NULL) + if (temp->control_macro) { /* This #endif matched a #ifndef at the start of the file. * See if it is at the end of the file. */ @@ -4514,7 +4514,7 @@ { file_name_list *ifile = pfile->all_include_files; - for (; ifile != NULL; ifile = ifile->next) + for (; ifile; ifile = ifile->next) { if (!strcmp(ifile->fname, CPP_BUFFER(pfile)->fname)) { @@ -4577,7 +4577,7 @@ cpp_buffer *next_buf = CPP_PREV_BUFFER(CPP_BUFFER(pfile)); CPP_BUFFER(pfile)->seen_eof = 1; - if (CPP_BUFFER(pfile)->nominal_fname && next_buf != NULL) + if (CPP_BUFFER(pfile)->nominal_fname && next_buf) { /* We're about to return from an #include file. * Emit #line information now (as part of the CPP_POP) result. @@ -5693,7 +5693,7 @@ * but that seems pointless: it comes before them, so it overrides them * anyway. */ p = (char *)getenv("CPATH"); - if (p != NULL && !opts->no_standard_includes) + if (p && !opts->no_standard_includes) path_include(pfile, p); /* Now that dollars_in_ident is known, initialize is_idchar. */ @@ -5702,7 +5702,7 @@ /* Do partial setup of input buffer for the sake of generating * early #line directives (when -g is in effect). */ fp = cpp_push_buffer(pfile, NULL, 0); - if (opts->in_fname == NULL) + if (!opts->in_fname) opts->in_fname = ""; fp->nominal_fname = fp->fname = opts->in_fname; fp->lineno = 0; @@ -5801,7 +5801,7 @@ for (pend = opts->pending; pend; pend = pend->next) { - if (pend->cmd != NULL && pend->cmd[0] == '-') + if (pend->cmd && pend->cmd[0] == '-') { switch (pend->cmd[1]) { @@ -5914,7 +5914,7 @@ } /* Search "translated" versions of GNU directories. * These have /usr/local/lib/gcc... replaced by specd_prefix. */ - if (specd_prefix != NULL && default_len != 0) + if (specd_prefix && default_len != 0) for (di = include_defaults; di->fname; di++) { /* Some standard dirs are only for C++. */ @@ -5942,7 +5942,7 @@ new_->c_system_include_path = !di->cxx_aware; new_->got_name_map = 0; append_include_chain(pfile, new_, new_); - if (opts->first_system_include == NULL) + if (!opts->first_system_include) opts->first_system_include = new_; } } @@ -5962,14 +5962,14 @@ new_->fname = (char *)di->fname; new_->got_name_map = 0; append_include_chain(pfile, new_, new_); - if (opts->first_system_include == NULL) + if (!opts->first_system_include) opts->first_system_include = new_; } } } /* Tack the after_include chain at the end of the include chain. */ append_include_chain(pfile, opts->after_include, opts->last_after_include); - if (opts->first_system_include == NULL) + if (!opts->first_system_include) opts->first_system_include = opts->after_include; /* With -v, print the list of dirs to search. */ @@ -5994,7 +5994,7 @@ pfile->no_record_file++; for (pend = opts->pending; pend; pend = pend->next) { - if (pend->cmd != NULL && strcmp(pend->cmd, "-imacros") == 0) + if (pend->cmd && strcmp(pend->cmd, "-imacros") == 0) { int fd = open(pend->arg, O_RDONLY, 0666); @@ -6013,7 +6013,7 @@ /* Copy the entire contents of the main input file into * the stacked input buffer previously allocated for it. */ - if (fname == NULL || *fname == 0) + if (!fname || *fname == 0) { fname = ""; f = 0; @@ -6041,7 +6041,7 @@ char *s; char *output_file; - if (spec == NULL) + if (!spec) { spec = getenv("SUNPRO_DEPENDENCIES"); opts->print_deps = 2; @@ -6090,9 +6090,9 @@ int len; /* Discard all directory prefixes from filename. */ - if ((q = (char *)strrchr(opts->in_fname, '/')) != NULL + if ((q = (char *)strrchr(opts->in_fname, '/')) #ifdef DIR_SEPARATOR - && (q = strrchr(opts->in_fname, DIR_SEPARATOR)) != NULL + && (q = strrchr(opts->in_fname, DIR_SEPARATOR)) #endif ) ++q; @@ -6138,7 +6138,7 @@ opts->pending = nreverse_pending(opts->pending); for (pend = opts->pending; pend; pend = pend->next) { - if (pend->cmd != NULL && strcmp(pend->cmd, "-include") == 0) + if (pend->cmd && strcmp(pend->cmd, "-include") == 0) { int fd = open(pend->arg, O_RDONLY, 0666); @@ -6228,9 +6228,9 @@ { if (argv[i][0] != '-') { - if (opts->out_fname != NULL) + if (opts->out_fname) cpp_fatal("Usage: %s [switches] input output", argv[0]); - else if (opts->in_fname != NULL) + else if (opts->in_fname) opts->out_fname = argv[i]; else opts->in_fname = argv[i]; @@ -6278,7 +6278,7 @@ strcpy(dirtmp->fname, argv[++i]); dirtmp->got_name_map = 0; - if (opts->before_system == NULL) + if (!opts->before_system) opts->before_system = dirtmp; else opts->last_before_system->next = dirtmp; @@ -6291,7 +6291,7 @@ file_name_list *dirtmp; char *prefix; - if (opts->include_prefix != NULL) + if (opts->include_prefix) prefix = opts->include_prefix; else { @@ -6318,7 +6318,7 @@ strcat(dirtmp->fname, argv[++i]); dirtmp->got_name_map = 0; - if (opts->after_include == NULL) + if (!opts->after_include) opts->after_include = dirtmp; else opts->last_after_include->next = dirtmp; @@ -6331,7 +6331,7 @@ file_name_list *dirtmp; char *prefix; - if (opts->include_prefix != NULL) + if (opts->include_prefix) prefix = opts->include_prefix; else { @@ -6378,7 +6378,7 @@ dirtmp->fname = argv[++i]; dirtmp->got_name_map = 0; - if (opts->after_include == NULL) + if (!opts->after_include) opts->after_include = dirtmp; else opts->last_after_include->next = dirtmp; @@ -6387,7 +6387,7 @@ break; case 'o': - if (opts->out_fname != NULL) + if (opts->out_fname) cpp_fatal("Output filename specified twice"); if (i + 1 == argc) cpp_fatal("Filename missing after -o option"); @@ -6600,7 +6600,7 @@ * that were passed automatically in from GCC. */ opts->inhibit_predefs = 1; - for (ptr = &opts->pending; *ptr != NULL;) + for (ptr = &opts->pending; *ptr;) { struct cpp_pending *pend = *ptr; @@ -6695,12 +6695,12 @@ break; case '\0': /* JF handle '-' as file name meaning stdin or stdout */ - if (opts->in_fname == NULL) + if (!opts->in_fname) { opts->in_fname = ""; break; } - else if (opts->out_fname == NULL) + else if (!opts->out_fname) { opts->out_fname = ""; break; @@ -6729,9 +6729,9 @@ const char *deps_mode = opts->print_deps_append ? "a" : "w"; - if (opts->deps_file == NULL) + if (!opts->deps_file) deps_stream = stdout; - else if ((deps_stream = fopen(opts->deps_file, deps_mode)) == 0) + else if (!(deps_stream = fopen(opts->deps_file, deps_mode))) cpp_pfatal_with_name(pfile, opts->deps_file); fputs(pfile->deps_buffer, deps_stream); putc('\n', deps_stream); @@ -6779,7 +6779,7 @@ tokens = read_token_list(pfile, &error_flag); if (error_flag) goto error; - if (tokens == NULL) + if (!tokens) { cpp_error(pfile, "empty token-sequence in `#assert'"); goto error; @@ -6803,7 +6803,7 @@ (struct tokenlist_list *)xmalloc(sizeof(struct tokenlist_list)); hp = assertion_lookup(pfile, symname, sym_length, hashcode); - if (hp == NULL) + if (!hp) { if (sym_length == 7 && !strncmp(symname, "defined", sym_length)) cpp_error(pfile, "`defined' redefined as assertion"); @@ -6856,7 +6856,7 @@ tokens = read_token_list(pfile, &error_flag); if (error_flag) goto error; - if (tokens == NULL) + if (!tokens) { cpp_error(pfile, "empty token list in `#unassert'"); goto error; @@ -6877,7 +6877,7 @@ struct tokenlist_list *tail, *prev; hp = assertion_lookup(pfile, symname, sym_length, hashcode); - if (hp == NULL) + if (!hp) return 1; /* If no token list was specified, then eliminate this assertion @@ -6936,7 +6936,7 @@ cpp_pedwarn(pfile, "ANSI C does not allow testing assertions"); hp = assertion_lookup(pfile, name, sym_length, hashcode); - if (hp == NULL) + if (!hp) /* It is not an assertion; just return false. */ return 0; @@ -7170,7 +7170,7 @@ for (;; pp = &(*pp)->next) { - if (*pp == NULL) + if (!*pp) cpp_fatal("internal error", "in parse_set_mark"); if (*pp == pmark) break; @@ -7238,7 +7238,7 @@ { cpp_buffer *ip = cpp_file_buffer(pfile); - if (ip != NULL) + if (ip) { long line, col; @@ -7320,7 +7320,7 @@ cpp_print_containing_files(pfile); - if (ip != NULL) + if (ip) cpp_file_line_for_message(pfile, ip->nominal_fname, line, column); cpp_message(pfile, 1, msg, NULL, NULL, NULL); @@ -7341,7 +7341,7 @@ ip = cpp_file_buffer(pfile); - if (ip != NULL) + if (ip) cpp_file_line_for_message(pfile, ip->nominal_fname, line, column); cpp_message(pfile, 0, msg, NULL, NULL, NULL); @@ -7368,7 +7368,7 @@ if (!CPP_OPTIONS(pfile)->pedantic_errors && CPP_OPTIONS(pfile)->inhibit_warnings) return; - if (file != NULL) + if (file) cpp_file_line_for_message(pfile, file, line, -1); cpp_message(pfile, CPP_OPTIONS(pfile)->pedantic_errors, msg, arg1, arg2, arg3); @@ -7423,7 +7423,7 @@ cpp_print_containing_files(pfile); - if (ip != NULL) + if (ip) cpp_file_line_for_message(pfile, ip->nominal_fname, ip->lineno, -1); cpp_message(pfile, 1, "%s: %s", name, my_strerror(errno), NULL); Modified: trunk/E16/e/src/arrange.c =================================================================== --- trunk/E16/e/src/arrange.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/arrange.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -527,7 +527,7 @@ { for (i = 0; i < num; i++) { - if (lst[i] == NULL) + if (!lst[i]) continue; if ((EoGetDesk(ewin) == EoGetDesk(lst[i]) || @@ -566,7 +566,7 @@ { for (i = 0; i < num; i++) { - if (lst[i] == NULL) + if (!lst[i]) continue; if ((EoGetDesk(ewin) == EoGetDesk(lst[i]) || @@ -603,7 +603,7 @@ { for (i = 0; i < num; i++) { - if (lst[i] == NULL) + if (!lst[i]) continue; if ((EoGetDesk(ewin) == EoGetDesk(lst[i]) || @@ -643,7 +643,7 @@ { for (i = 0; i < num; i++) { - if (lst[i] == NULL) + if (!lst[i]) continue; if ((EoGetDesk(ewin) == EoGetDesk(lst[i]) || Modified: trunk/E16/e/src/backgrounds.c =================================================================== --- trunk/E16/e/src/backgrounds.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/backgrounds.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -871,7 +871,7 @@ void BackgroundIncRefcount(Background * bg) { - if (bg == NULL) + if (!bg) return; bg->ref_count++; } @@ -879,7 +879,7 @@ void BackgroundDecRefcount(Background * bg) { - if (bg == NULL) + if (!bg) return; bg->ref_count--; if (bg->ref_count <= 0) @@ -889,7 +889,7 @@ void BackgroundTouch(Background * bg) { - if (bg == NULL) + if (!bg) return; bg->last_viewed = time(NULL); } @@ -1300,7 +1300,7 @@ bg = (Background *) ecore_list_next(bg_list); if (!bg) break; - for (; (bgx = (Background *) ecore_list_next(bg_list)) != NULL;) + for (; (bgx = (Background *)ecore_list_next(bg_list));) { if (bgx->ref_count > 0 || bgx->referenced) continue; @@ -2337,7 +2337,7 @@ int xjust, yjust, xperc, yperc; int txjust, tyjust, txperc, typerc; - if (params == NULL) + if (!params) return; bgf[0] = topf[0] = '\0'; Modified: trunk/E16/e/src/borders.c =================================================================== --- trunk/E16/e/src/borders.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/borders.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -549,7 +549,7 @@ if (ewin->border == b) return; - if (b == NULL) + if (!b) { b = ewin->border; ewin->border = NULL; Modified: trunk/E16/e/src/config.c =================================================================== --- trunk/E16/e/src/config.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/config.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -75,11 +75,11 @@ const char *si; size_t nr; - if (buffer == NULL) + if (!buffer) { buffer = EMALLOC(char, LINE_BUFFER_SIZE); - if (buffer == NULL) + if (!buffer) return NULL; buffer[LINE_BUFFER_SIZE - 1] = '\0'; } @@ -91,7 +91,7 @@ for (;;) { /* Get a line from the input file */ - if (si == NULL) + if (!si) { nr = fread(buffer, 1, LINE_BUFFER_SIZE - 1, f); if (nr == 0) @@ -151,7 +151,7 @@ done: bufptr = si; - if (si == NULL) + if (!si) { /* EOF */ Efree(buffer); Modified: trunk/E16/e/src/coords.c =================================================================== --- trunk/E16/e/src/coords.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/coords.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -49,7 +49,7 @@ if (!Conf.movres.mode_info) return; - if (ewin == NULL || !ewin->state.show_coords) + if (!ewin || !ewin->state.show_coords) return; tc = TextclassFind("COORDS", 1); Modified: trunk/E16/e/src/e16-ecore_list.c =================================================================== --- trunk/E16/e/src/e16-ecore_list.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/e16-ecore_list.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -205,7 +205,7 @@ list->last = end; - if (list->first == NULL) + if (!list->first) { list->first = end; list->index = 0; @@ -251,7 +251,7 @@ list->first = start; /* If no last node, then the first node is the last node */ - if (list->last == NULL) + if (!list->last) list->last = list->first; list->nodes++; @@ -292,7 +292,7 @@ if (list->current == list->first) return _ecore_list_prepend_0(list, new_node); - if (list->current == NULL) + if (!list->current) { int ret_value; @@ -751,7 +751,7 @@ return NULL; for (i = 0, ecore_list_first_goto(list); - (b = ecore_list_next(list)) != NULL;) + (b = ecore_list_next(list));) lst[i++] = b; *pnum = num; Modified: trunk/E16/e/src/econfig.c =================================================================== --- trunk/E16/e/src/econfig.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/econfig.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -256,7 +256,7 @@ Eprintf("ConfigurationSave\n"); ecf = e16_db_open(ConfigurationGetFile(buf, sizeof(buf))); - if (ecf == NULL) + if (!ecf) return; /* Load module configs */ Modified: trunk/E16/e/src/eobj.c =================================================================== --- trunk/E16/e/src/eobj.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/eobj.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -270,7 +270,7 @@ eo->floating = 1; EobjSetLayer(eo, 20); EobjInit(eo, type, EobjGetWin(eo), x, y, w, h, su, name); - if (eo->win == NULL) + if (!eo->win) { Efree(eo); eo = NULL; Modified: trunk/E16/e/src/ewin-ops.c =================================================================== --- trunk/E16/e/src/ewin-ops.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/ewin-ops.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -186,7 +186,7 @@ { if (floating == 0) { - dsk = (pdesk == NULL) ? EoGetDesk(ewin) : pdesk; + dsk = (!pdesk) ? EoGetDesk(ewin) : pdesk; floating = 1; } else if (floating == 1) Modified: trunk/E16/e/src/file.c =================================================================== --- trunk/E16/e/src/file.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/file.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -246,7 +246,7 @@ const char *p; p = strrchr(file, '.'); - if (p != NULL) + if (p) { return p + 1; } Modified: trunk/E16/e/src/finders.c =================================================================== --- trunk/E16/e/src/finders.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/finders.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -238,7 +238,7 @@ goto done; ewins = EwinListGetAll(&num); - if (ewins == NULL) /* Should not be possible */ + if (!ewins) /* Should not be possible */ goto done; /* Loop through window stack, bottom up */ @@ -298,7 +298,7 @@ } done: - if (gwins == NULL) + if (!gwins) { gwins = EMALLOC(EWin *, 1); gwins[0] = (EWin *) ewin; Modified: trunk/E16/e/src/focus.c =================================================================== --- trunk/E16/e/src/focus.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/focus.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -310,7 +310,7 @@ case FOCUS_CLICK: if (ewin && ewin == Mode.focuswin) return; - if (ewin == NULL) /* Unfocus */ + if (!ewin) /* Unfocus */ break; if (!FocusEwinValid(ewin, 1, why == FOCUS_CLICK, 0)) return; Modified: trunk/E16/e/src/iclass.c =================================================================== --- trunk/E16/e/src/iclass.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/iclass.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -98,7 +98,7 @@ alpha[i] = 255 - Conf.trans.alpha; } - if (icm == NULL) + if (!icm) icm = EImageColorModifierCreate(); EImageColorModifierSetTables(icm, gray, gray, gray, alpha); } @@ -693,7 +693,7 @@ if (!is) return NULL; - if (is->im == NULL) + if (!is->im) ImagestateRealize(is); im = is->im; @@ -805,7 +805,7 @@ if (!is) return NULL; - if (is->im == NULL) + if (!is->im) ImagestateRealize(is); im = is->im; if (!im) @@ -1097,7 +1097,7 @@ { int w, h; - if (win == NULL || !ic) + if (!win || !ic) return; w = WinGetW(win); @@ -1116,7 +1116,7 @@ ts = TextclassGetTextState(tc, state, active, sticky); } - if (is->im == NULL) + if (!is->im) ImagestateRealize(is); /* Imlib2 will not render pixmaps with dimensions > 8192 */ @@ -1240,7 +1240,7 @@ { ImageState *is; - if (pmm == NULL) + if (!pmm) return; pmm->type = 0; @@ -1253,7 +1253,7 @@ if (!is) return; - if (is->im == NULL) + if (!is->im) ImagestateRealize(is); /* Imlib2 will not render pixmaps with dimensions > 8192 */ Modified: trunk/E16/e/src/iconify.c =================================================================== --- trunk/E16/e/src/iconify.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/iconify.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -379,7 +379,7 @@ for (i = 0; i < num; i++) { ct = lst[i]; - if (ct->ewin == NULL || ct->type != IB_TYPE_ICONBOX) + if (!ct->ewin || ct->type != IB_TYPE_ICONBOX) continue; dx = (EoGetX(ct->ewin) + (EoGetW(ct->ewin) / 2)) - Modified: trunk/E16/e/src/ipc.c =================================================================== --- trunk/E16/e/src/ipc.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/ipc.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -101,7 +101,7 @@ vnew = vold = *item != 0; /* Remember old value */ - if (value == NULL || value[0] == '\0') + if (!value || value[0] == '\0') vnew = !vold; else if (!strcmp(value, "on")) vnew = 1; @@ -1224,7 +1224,7 @@ char param2[FILEPATH_LEN_MAX]; EWin *ewin, *enew; - if (params == NULL) + if (!params) return; sscanf(params, "%100s %100s", param1, param2); @@ -1867,7 +1867,7 @@ { ipc = lst[i]; if (strcmp(params, ipc->name) && - (ipc->nick == NULL || strcmp(params, ipc->nick))) + (!ipc->nick || strcmp(params, ipc->nick))) continue; nick = (ipc->nick) ? ipc->nick : ""; Modified: trunk/E16/e/src/lang.c =================================================================== --- trunk/E16/e/src/lang.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/lang.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -112,7 +112,7 @@ char * EstrUtf82Int(const char *str, int len) { - if (str == NULL) + if (!str) return NULL; #if HAVE_ICONV @@ -133,7 +133,7 @@ if (Mode.locale.utf8_int == want_utf8) return str; - if (str == NULL) + if (!str) return NULL; if (want_utf8) Modified: trunk/E16/e/src/main.c =================================================================== --- trunk/E16/e/src/main.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/main.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -614,7 +614,7 @@ Mode.conf.prefix = Estrdup(buf); - for (s = Mode.conf.prefix; (s = strchr(s, ':')) != NULL; *s = '-') + for (s = Mode.conf.prefix; (s = strchr(s, ':')); *s = '-') ; } Modified: trunk/E16/e/src/menus.c =================================================================== --- trunk/E16/e/src/menus.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/menus.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -1205,7 +1205,7 @@ { int i; - if (mi == NULL) + if (!mi) { if (m->num > 0) return m->items[0]; @@ -1284,13 +1284,13 @@ goto check_activate; case XK_Right: - if (mi == NULL) + if (!mi) goto check_next; m = mi->child; if (!m || m->num <= 0) break; ewin = m->ewin; - if (ewin == NULL || !EwinIsMapped(ewin)) + if (!ewin || !EwinIsMapped(ewin)) break; mi = MenuFindItemByChild(m, m->child); goto check_activate; Modified: trunk/E16/e/src/snaps.c =================================================================== --- trunk/E16/e/src/snaps.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/snaps.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -1502,7 +1502,7 @@ Snapshot *sn; sn = ewin->snap; - if (sn == NULL) + if (!sn) return; ewin->snap = NULL; Modified: trunk/E16/e/src/snprintf.c =================================================================== --- trunk/E16/e/src/snprintf.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/snprintf.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -289,7 +289,7 @@ int padlen, strlen, i, c; /* amount to pad */ zpad = 0; - if (value == NULL) + if (!value) { value = "<NULL>"; } @@ -457,7 +457,7 @@ static void dopr_outch(int c) { - if (end == NULL || output < end) + if (!end || output < end) { *output++ = c; } Modified: trunk/E16/e/src/startup.c =================================================================== --- trunk/E16/e/src/startup.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/startup.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -168,7 +168,7 @@ void StartupWindowsOpen(void) { - if (init_win1 == NULL || init_win2 == NULL) + if (!init_win1 || !init_win2) return; Mode.place.enable_features--; Modified: trunk/E16/e/src/systray.c =================================================================== --- trunk/E16/e/src/systray.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/systray.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -119,7 +119,7 @@ Eprintf("SystrayObjManage %#lx\n", xwin); #endif win = ERegisterWindow(xwin, NULL); - if (win == NULL) + if (!win) return win; ESelectInput(win, StructureNotifyMask | PropertyChangeMask); @@ -184,7 +184,7 @@ goto bail_out; win = SystrayObjManage(ct, xwin); - if (win == NULL) + if (!win) goto bail_out; swin->win = win; Modified: trunk/E16/e/src/theme.c =================================================================== --- trunk/E16/e/src/theme.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/theme.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -53,7 +53,7 @@ int i; char s[4096]; - for (i = 0; (tf = theme_files[i]) != NULL; i++) + for (i = 0; (tf = theme_files[i]); i++) { Esnprintf(s, sizeof(s), "%s/%s", path, tf); if (!isfile(s)) @@ -171,7 +171,7 @@ /* We only attempt to dereference a DEFAULT link */ s = strstr(path, "/DEFAULT"); - if (s == NULL) + if (!s) return path; l = readlink(path, s1, sizeof(s1) - 1); Modified: trunk/E16/e/src/tooltips.c =================================================================== --- trunk/E16/e/src/tooltips.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e/src/tooltips.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -92,7 +92,7 @@ ToolTip *tt; ImageClass *ic; - if (ic0 == NULL || tclass == NULL) + if (!ic0 || !tclass) return NULL; ic = ImageclassAlloc(ic0, 0); Modified: trunk/E16/e16menuedit/src/callbacks.c =================================================================== --- trunk/E16/e16menuedit/src/callbacks.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e16menuedit/src/callbacks.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -350,7 +350,7 @@ homedir (getuid ()), APP_HOME); fz_properties = fopen (filename_properties, "r"); - if (fz_properties != NULL) + if (fz_properties) { fscanf (fz_properties, "%s = %s", key, value); Modified: trunk/E16/e16menuedit/src/e16menu.c =================================================================== --- trunk/E16/e16menuedit/src/e16menu.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e16menuedit/src/e16menu.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -265,7 +265,7 @@ #ifdef WRITE_FILE menu_ptr = fopen (menu_file[depth-1], "a+"); #endif /* WRITE_FILE */ - if (menu_ptr == NULL) + if (!menu_ptr) { printf ("Couldn't save menu to: %s\n", menu_file[depth-1]); } @@ -274,7 +274,7 @@ { #ifdef WRITE_FILE menu_ptr2 = fopen (menu_file[depth], "w"); - if (menu_ptr2 == NULL) + if (!menu_ptr2) { printf ("Couldn't save menu to: %s\n", menu_file[depth]); } @@ -318,7 +318,7 @@ { #ifdef WRITE_FILE menu_ptr2 = fopen (menu_file[depth], "w"); - if (menu_ptr2 == NULL) + if (!menu_ptr2) { printf ("Couldn't save menu to: %s\n", menu_file[depth]); } Modified: trunk/E16/e16menuedit/src/e16menuedit2.c =================================================================== --- trunk/E16/e16menuedit/src/e16menuedit2.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e16menuedit/src/e16menuedit2.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -123,7 +123,7 @@ homedir (getuid ()), APP_HOME); fz_properties = fopen (filename_properties, "r"); - if (fz_properties != NULL) + if (fz_properties) { fscanf (fz_properties, "%s = %s", key, value); Modified: trunk/E16/e16menuedit/src/file.c =================================================================== --- trunk/E16/e16menuedit/src/file.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e16menuedit/src/file.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -211,7 +211,7 @@ i++; } - while (tok != NULL); + while (tok); free (pathname_copy); @@ -253,7 +253,7 @@ s_new = s; } - for (i = 0; pos != NULL; i++) + for (i = 0; pos; i++) { pos = strstr (s_new, delim); @@ -286,17 +286,17 @@ ver1_token = strtok_r (ver1, ".", &ver1_ptr); ver2_token = strtok_r (ver2, ".", &ver2_ptr); - while ((ver1_token != NULL) || (ver2_token != NULL)) + while ((ver1_token) || (ver2_token)) { int ver1_i; int ver2_i; - if (ver1_token == NULL) + if (!ver1_token) ver1_i = 0; else ver1_i = atoi (ver1_token); - if (ver2_token == NULL) + if (!ver2_token) ver2_i = 0; else ver2_i = atoi (ver2_token); Modified: trunk/E16/e16menuedit/src/icon_chooser.c =================================================================== --- trunk/E16/e16menuedit/src/icon_chooser.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e16menuedit/src/icon_chooser.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -132,7 +132,7 @@ select = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview_menu)); if (gtk_tree_selection_get_selected (select, &model, &iter) - && filename != NULL) + && filename) { const gchar *entry_select; gint width, height; @@ -238,7 +238,7 @@ gdk_pixbuf_save (icon_pixbuf, filename, "png", NULL, NULL); } - if (icon_pixbuf != NULL) + if (icon_pixbuf) { gtk_tree_store_set (GTK_TREE_STORE (model), &iter, COL_ICON, icon_pixbuf, @@ -263,7 +263,7 @@ COL_ICON, &icon_pixbuf, -1); - if (icon_pixbuf != NULL) + if (icon_pixbuf) { g_object_unref (icon_pixbuf); } @@ -292,7 +292,7 @@ preview = GTK_WIDGET (data); filename = gtk_file_chooser_get_preview_filename (file_chooser); - if (filename != NULL) + if (filename) { gchar *right; Modified: trunk/E16/e16menuedit/src/treeview.c =================================================================== --- trunk/E16/e16menuedit/src/treeview.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/e16menuedit/src/treeview.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -203,7 +203,7 @@ print_statusbar (_("Menu saved!")); /* free allocated menu files */ - while (menu_file[i] != NULL) + while (menu_file[i]) { g_free (menu_file[i]); i++; Modified: trunk/E16/epplets/api/epplet.c =================================================================== --- trunk/E16/epplets/api/epplet.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/api/epplet.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -849,7 +849,7 @@ Epplet_window win; win = Epplet_window_get_from_Window(newwin); - if (win == NULL) + if (!win) return; Epplet_unregister_window(win); @@ -909,13 +909,10 @@ Epplet_window win; win = Epplet_window_get_from_Window(newwin); - if (win == NULL) + if (!win) return; - if (((window_stack - = - realloc(window_stack, - sizeof(Epplet_window) * (window_stack_pos + 1))) == NULL)) + if ((!(window_stack = realloc(window_stack, sizeof(Epplet_window) * (window_stack_pos + 1))))) exit(1); window_stack[window_stack_pos] = win; window_stack_pos++; @@ -929,10 +926,7 @@ window_stack_pos--; ret = window_stack[window_stack_pos]; - if (((window_stack - = - realloc(window_stack, - sizeof(Epplet_window) * (window_stack_pos))) == NULL)) + if ((!(window_stack = realloc(window_stack, sizeof(Epplet_window) * (window_stack_pos))))) exit(1); /* Window stack pos == 0 corresponds to the main epplet window */ if (window_stack_pos < 1) @@ -2289,7 +2283,7 @@ if (g->contents == new_contents) return; - else if (g->contents != NULL) + else if (g->contents) free(g->contents); if ((s = strchr(new_contents, '\n'))) @@ -2336,7 +2330,7 @@ GC gc; GADGET_CONFIRM_TYPE(eg, E_TEXTBOX); - if ((g = (GadTextBox *) eg) == NULL) + if (!(g = (GadTextBox *)eg)) return; if (g->hilited) @@ -2656,7 +2650,7 @@ } else { - if (g->contents != NULL) + if (g->contents) { g->contents = (char *)realloc(g->contents, (strlen(g->contents) + len + 1)); @@ -4294,7 +4288,7 @@ g = (GadTextBox *) gadget; - if (g->contents == NULL) + if (!g->contents) break; XTranslateCoordinates(disp, g->win, root, 0, 0, &tmp_x, &tmp_y, @@ -4681,7 +4675,7 @@ Epplet_window win; win = Epplet_window_get_from_Window(newwin); - if (win == NULL) + if (!win) return; if (win->bg_pmap) @@ -5746,7 +5740,7 @@ memset(config_dict, 0, sizeof(ConfigDict)); config_dict->entries = malloc(sizeof(ConfigItem)); - if ((f = fopen(file, "r")) == NULL) + if (!(f = fopen(file, "r"))) return; for (; fgets(s, sizeof(s), f);) { Modified: trunk/E16/epplets/api/snprintf.c =================================================================== --- trunk/E16/epplets/api/snprintf.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/api/snprintf.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -296,7 +296,7 @@ int padlen, strlen, i, c; /* amount to pad */ zpad = 0; - if (value == NULL) + if (!value) { value = "<NULL>"; } @@ -464,7 +464,7 @@ static void dopr_outch(int c) { - if (end == NULL || output < end) + if (!end || output < end) { *output++ = c; } Modified: trunk/E16/epplets/epplets/E-Biff.c =================================================================== --- trunk/E16/epplets/epplets/E-Biff.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/epplets/E-Biff.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -122,7 +122,7 @@ { XBell(Epplet_get_display(), 0); } - else if (sound != NULL) + else if (sound) { Epplet_run_command(sound); } @@ -469,9 +469,9 @@ argc, argv, 0); Epplet_load_config(); process_conf(); - if (folder_path == NULL) + if (!folder_path) { - if ((folder_path = getenv("MAIL")) != NULL) + if ((folder_path = getenv("MAIL"))) { Epplet_modify_config("mailbox", folder_path); folder_path = Epplet_query_config("mailbox"); Modified: trunk/E16/epplets/epplets/E-Disk.c =================================================================== --- trunk/E16/epplets/epplets/E-Disk.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/epplets/E-Disk.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -80,9 +80,9 @@ unsigned long in_blks = 0, out_blks = 0; static unsigned long last_in = 0, last_out = 0, in_delta = 0, out_delta = 0; - if ((fp = fopen("/proc/diskstats", "r")) == NULL) + if (!(fp = fopen("/proc/diskstats", "r"))) { - if ((fp = fopen("/proc/stat", "r")) == NULL) + if (!(fp = fopen("/proc/stat", "r"))) { D(("Failed to open /proc/stat -- %s\n", strerror(errno))); return; Modified: trunk/E16/epplets/epplets/E-Magic.c =================================================================== --- trunk/E16/epplets/epplets/E-Magic.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/epplets/E-Magic.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -280,7 +280,7 @@ unsigned long len; fp = fopen(path, "r"); - if (fp == NULL) + if (!fp) { return 0; } @@ -351,7 +351,7 @@ } s = Epplet_query_config("delay"); - if (s != NULL) + if (s) { delay = atof(s); } Modified: trunk/E16/epplets/epplets/E-MemWatch.c =================================================================== --- trunk/E16/epplets/epplets/E-MemWatch.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/epplets/E-MemWatch.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -77,7 +77,7 @@ #else FILE *fp; - if ((fp = fopen("/proc/meminfo", "r")) == NULL) + if (!(fp = fopen("/proc/meminfo", "r"))) { D(("Failed to open /proc/meminfo -- %s\n", strerror(errno))); return; @@ -278,7 +278,7 @@ FILE *fp; char version[8], buff[1024]; - if ((fp = fopen("/proc/version", "r")) == NULL) + if (!(fp = fopen("/proc/version", "r"))) { D(("Failed to open /proc/version -- %s\nWill assume not 2.6 kernel", strerror(errno))); Modified: trunk/E16/epplets/epplets/E-Mountbox.c =================================================================== --- trunk/E16/epplets/epplets/E-Mountbox.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/epplets/E-Mountbox.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -937,7 +937,7 @@ type = type->next; } - if (tail_tile->image == NULL) + if (!tail_tile->image) { s = Epplet_query_config("DEFAULT"); @@ -1008,7 +1008,7 @@ if (types) { - if ((types->key == NULL) && (types->image == NULL)) + if ((!types->key) && (!types->image)) { if (key) types->key = strdup(key); @@ -1244,7 +1244,7 @@ char *info[4]; int i; - if ((f = fopen(FSTAB, "r")) == NULL) + if (!(f = fopen(FSTAB, "r"))) return 0; *s = 0; for (; fgets(s, sizeof(s), f);) @@ -1293,7 +1293,7 @@ char *token = NULL, *device = NULL, *path = NULL; Tile *tile; - if ((f = fopen(PROCMOUNTS, "r")) == NULL) + if (!(f = fopen(PROCMOUNTS, "r"))) return 0; *s = 0; for (; fgets(s, sizeof(s), f);) @@ -1349,7 +1349,7 @@ char *token = NULL, *device = NULL, *path = NULL; Tile *tile; - if ((f = fopen(ETCMTAB, "r")) == NULL) + if (!(f = fopen(ETCMTAB, "r"))) return 0; *s = 0; for (; fgets(s, sizeof(s), f);) @@ -1417,7 +1417,7 @@ if (dir) { num_entries = 0; - for (num_entries = 0; (dp = readdir(dir)) != NULL; + for (num_entries = 0; (dp = readdir(dir)); num_entries++); if (num_entries > 2) { Modified: trunk/E16/epplets/epplets/E-OpenGL-Demo.c =================================================================== --- trunk/E16/epplets/epplets/E-OpenGL-Demo.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/epplets/E-OpenGL-Demo.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -246,7 +246,7 @@ cx = (GLXContext *) data; Epplet_unremember(); Esync(); - if (cx != NULL) + if (cx) Epplet_unbind_GL(*cx); exit(0); } @@ -465,7 +465,7 @@ /* This could also be done as: * cx = Epplet_bind_double_GL(da, 1, 1, 1, 0, 0, 8, 0, 0, 0, 0, 0); */ - if (cx == NULL) + if (!cx) cb_close(NULL); /* To properly center the viewport, -2, -2 isntead of 0, 0 must be used. @@ -485,7 +485,7 @@ /* Lets load teh texture */ Esnprintf(buf, sizeof(buf), "%s/cube_texture.RGB", Epplet_data_dir()); - if ((textureFile = fopen(buf, "rb")) == NULL) + if (!(textureFile = fopen(buf, "rb"))) { printf("Failed to load the cube texture file!\n"); } Modified: trunk/E16/epplets/epplets/E-Pants.c =================================================================== --- trunk/E16/epplets/epplets/E-Pants.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/epplets/E-Pants.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -158,7 +158,7 @@ { char *tmp; - if (button_string != NULL) + if (button_string) { tmp = strdup(button_string); if (strlen(tmp) > LABEL_CHAR) @@ -172,7 +172,7 @@ Epplet_change_popbutton_label(pb_log_small, tmp); free(tmp); } - if (entry_string != NULL) + if (entry_string) { Epplet_add_popup_entry(p_log, entry_string, NULL, NULL, NULL); if (log_entries >= LOG_LEN) Modified: trunk/E16/epplets/epplets/E-Pinger.c =================================================================== --- trunk/E16/epplets/epplets/E-Pinger.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/epplets/E-Pinger.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -123,7 +123,7 @@ /* Set reaper so we don't get zombies */ signal(SIGCHLD, (void (*)(int))pinger_reaper); - if (command == NULL || *command == '\0') + if (!command || *command == '\0') { return 1; } @@ -252,7 +252,7 @@ { char *tmp; - if (button_string != NULL) + if (button_string) { tmp = strdup(button_string); if (strlen(tmp) > LABEL_CHAR) @@ -266,7 +266,7 @@ Epplet_change_popbutton_label(pb_log_small, tmp); free(tmp); } - if (entry_string != NULL) + if (entry_string) { Epplet_add_popup_entry(p_log, entry_string, NULL, NULL, NULL); if (log_entries >= LOG_LEN) @@ -294,12 +294,12 @@ { char *c_p, *last_p; - if (new_host == NULL || *new_host == '\0') + if (!new_host || *new_host == '\0') { return (0); } - if (host != NULL) + if (host) { free(host); } @@ -313,7 +313,7 @@ } } - if ((host = strdup(new_host)) == NULL) + if (!(host = strdup(new_host))) { perror("set_host: strdup"); return (-1); @@ -332,7 +332,7 @@ char *c_p; char *last_p; - if (new_pause == NULL || *new_pause == '\0') + if (!new_pause || *new_pause == '\0') { return (0); } @@ -504,13 +504,13 @@ b_help = Epplet_create_button(NULL, NULL, 82, 2, 0, 0, "HELP", win, NULL, cb_help, NULL); - if ((result = (char *)malloc(BUF_LEN)) == NULL) + if (!(result = (char *)malloc(BUF_LEN))) { perror("main: malloc result"); return (-1); } *result = '\0'; - if ((new_result = (char *)malloc(BUF_LEN)) == NULL) + if (!(new_result = (char *)malloc(BUF_LEN))) { perror("main: malloc new_result"); return (-1); Modified: trunk/E16/epplets/epplets/E-ScreenShoot_ftp.c =================================================================== --- trunk/E16/epplets/epplets/E-ScreenShoot_ftp.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/epplets/E-ScreenShoot_ftp.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -27,7 +27,7 @@ if (-1 == (master = getpt())) return -1; if (-1 == grantpt(master) || -1 == unlockpt(master) - || NULL == (slave = ptsname(master))) + || !(slave = ptsname(master))) { close(master); return -1; @@ -160,7 +160,7 @@ for (p = line; p && *p; p = n) { /* split into lines */ - if (NULL != (n = strchr(p, '\n')) || NULL != (n = strchr(p, '\r'))) + if ((n = strchr(p, '\n')) || (n = strchr(p, '\r'))) *(n++) = 0; else n = NULL; @@ -168,18 +168,18 @@ fprintf(stderr, "<< %s\n", p); /* prompt? */ - if (NULL != strstr(p, "ftp>")) + if (strstr(p, "ftp>")) { done = 1; } /* line dropped ? */ - if (NULL != strstr(p, "closed connection")) + if (strstr(p, "closed connection")) { fprintf(stderr, "ftp: lost connection\n"); ftp_connected = 0; } - if (NULL != strstr(p, "Not connected")) + if (strstr(p, "Not connected")) { if (ftp_connected) fprintf(stderr, "ftp: lost connection\n"); Modified: trunk/E16/epplets/epplets/E-Slides.c =================================================================== --- trunk/E16/epplets/epplets/E-Slides.c 2010-08-13 16:59:15 UTC (rev 51091) +++ trunk/E16/epplets/epplets/E-Slides.c 2010-08-13 17:04:13 UTC (rev 51092) @@ -105,7 +105,7 @@ return ((char **)NULL); } /* count # of entries in dir (worst case) */ - for (dirlen = 0; (dp = readdir(dirp)) != NULL; dirlen... [truncated message content] |