From: Enlightenment S. <no-...@en...> - 2010-08-10 19:24:46
|
Log: Do not compare pointers to 0 Author: lucas Date: 2010-08-10 12:24:38 -0700 (Tue, 10 Aug 2010) New Revision: 50973 Modified: trunk/E16/e/epp/cppalloc.c trunk/E16/e/epp/cpplib.c trunk/E16/e/src/snprintf.c trunk/E16/epplets/api/snprintf.c trunk/TEST/orig/evas/evas_xrender_xcb_main.c trunk/e/src/bin/e_actions.c trunk/ecore/src/lib/ecore/ecore_exe.c trunk/embryo/src/bin/embryo_cc_sc1.c trunk/embryo/src/bin/embryo_cc_sc3.c trunk/eterm/libast/src/snprintf.c Modified: trunk/E16/e/epp/cppalloc.c =================================================================== --- trunk/E16/e/epp/cppalloc.c 2010-08-10 19:12:07 UTC (rev 50972) +++ trunk/E16/e/epp/cppalloc.c 2010-08-10 19:24:38 UTC (rev 50973) @@ -37,7 +37,7 @@ { char *ptr = (char *)malloc(size); - if (ptr != 0) + if (ptr != NULL) return (ptr); memory_full(); /*NOTREACHED */ @@ -49,7 +49,7 @@ { char *ptr = (char *)realloc(old, size); - if (ptr == 0) + if (ptr == NULL) memory_full(); return ptr; } @@ -59,7 +59,7 @@ { char *ptr = (char *)calloc(number, size); - if (ptr == 0) + if (ptr == NULL) memory_full(); return ptr; } Modified: trunk/E16/e/epp/cpplib.c =================================================================== --- trunk/E16/e/epp/cpplib.c 2010-08-10 19:12:07 UTC (rev 50972) +++ trunk/E16/e/epp/cpplib.c 2010-08-10 19:24:38 UTC (rev 50973) @@ -690,12 +690,12 @@ if (!first || !last) return; - if (opts->include == 0) + if (opts->include == NULL) opts->include = first; else opts->last_include->next = first; - if (opts->first_bracket_include == 0) + if (opts->first_bracket_include == NULL) opts->first_bracket_include = first; for (dir = first;; dir = dir->next) @@ -1632,7 +1632,7 @@ { memcpy(&defn->args.argnames[i], temp->name, temp->length); i += temp->length; - if (temp->next != 0) + if (temp->next != NULL) { defn->args.argnames[i++] = ','; defn->args.argnames[i++] = ' '; @@ -1852,7 +1852,7 @@ HASHNODE *hp; create_definition(&mdef, buf, limit, pfile, keyword == NULL); - if (mdef.defn == 0) + if (mdef.defn == NULL) return 1; hashcode = hashf(mdef.symnam, mdef.symlen, HASHSIZE); @@ -3495,7 +3495,7 @@ break; /* This file was included before. */ } - if (ptr == 0) + if (ptr == NULL) { /* This is the first time for this file. */ /* Add it to list of files included. */ @@ -3835,7 +3835,7 @@ ip->nominal_fname = hp->value.cpval; break; } - if (hp == 0) + if (hp == NULL) { /* Didn't find it; cons up a new one. */ hp = (HASHNODE *) xcalloc(1, sizeof(HASHNODE) + fname_length + 1); @@ -4483,7 +4483,7 @@ IF_STACK_FRAME *temp = pfile->if_stack; pfile->if_stack = temp->next; - if (temp->control_macro != 0) + if (temp->control_macro != NULL) { /* This #endif matched a #ifndef at the start of the file. * See if it is at the end of the file. */ @@ -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 != 0) + if (CPP_BUFFER(pfile)->nominal_fname && next_buf != NULL) { /* 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 != 0 && !opts->no_standard_includes) + if (p != NULL && !opts->no_standard_includes) path_include(pfile, p); /* Now that dollars_in_ident is known, initialize is_idchar. */ @@ -5914,7 +5914,7 @@ } /* Search "translated" versions of GNU directories. * These have /usr/local/lib/gcc... replaced by specd_prefix. */ - if (specd_prefix != 0 && default_len != 0) + if (specd_prefix != NULL && 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 == 0) + if (opts->first_system_include == NULL) 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 == 0) + if (opts->first_system_include == NULL) 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 == 0) + if (opts->first_system_include == NULL) opts->first_system_include = opts->after_include; /* With -v, print the list of dirs to search. */ @@ -6041,7 +6041,7 @@ char *s; char *output_file; - if (spec == 0) + if (spec == NULL) { spec = getenv("SUNPRO_DEPENDENCIES"); opts->print_deps = 2; @@ -6278,7 +6278,7 @@ strcpy(dirtmp->fname, argv[++i]); dirtmp->got_name_map = 0; - if (opts->before_system == 0) + if (opts->before_system == NULL) 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 != 0) + if (opts->include_prefix != NULL) prefix = opts->include_prefix; else { @@ -6318,7 +6318,7 @@ strcat(dirtmp->fname, argv[++i]); dirtmp->got_name_map = 0; - if (opts->after_include == 0) + if (opts->after_include == NULL) 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 != 0) + if (opts->include_prefix != NULL) prefix = opts->include_prefix; else { @@ -6378,7 +6378,7 @@ dirtmp->fname = argv[++i]; dirtmp->got_name_map = 0; - if (opts->after_include == 0) + if (opts->after_include == NULL) opts->after_include = dirtmp; else opts->last_after_include->next = dirtmp; @@ -6729,7 +6729,7 @@ const char *deps_mode = opts->print_deps_append ? "a" : "w"; - if (opts->deps_file == 0) + if (opts->deps_file == NULL) deps_stream = stdout; else if ((deps_stream = fopen(opts->deps_file, deps_mode)) == 0) cpp_pfatal_with_name(pfile, opts->deps_file); @@ -6779,7 +6779,7 @@ tokens = read_token_list(pfile, &error_flag); if (error_flag) goto error; - if (tokens == 0) + if (tokens == NULL) { cpp_error(pfile, "empty token-sequence in `#assert'"); goto error; @@ -6856,7 +6856,7 @@ tokens = read_token_list(pfile, &error_flag); if (error_flag) goto error; - if (tokens == 0) + if (tokens == NULL) { cpp_error(pfile, "empty token list in `#unassert'"); goto error; Modified: trunk/E16/e/src/snprintf.c =================================================================== --- trunk/E16/e/src/snprintf.c 2010-08-10 19:12:07 UTC (rev 50972) +++ trunk/E16/e/src/snprintf.c 2010-08-10 19:24:38 UTC (rev 50973) @@ -289,7 +289,7 @@ int padlen, strlen, i, c; /* amount to pad */ zpad = 0; - if (value == 0) + if (value == NULL) { value = "<NULL>"; } @@ -457,7 +457,7 @@ static void dopr_outch(int c) { - if (end == 0 || output < end) + if (end == NULL || output < end) { *output++ = c; } Modified: trunk/E16/epplets/api/snprintf.c =================================================================== --- trunk/E16/epplets/api/snprintf.c 2010-08-10 19:12:07 UTC (rev 50972) +++ trunk/E16/epplets/api/snprintf.c 2010-08-10 19:24:38 UTC (rev 50973) @@ -296,7 +296,7 @@ int padlen, strlen, i, c; /* amount to pad */ zpad = 0; - if (value == 0) + if (value == NULL) { value = "<NULL>"; } @@ -464,7 +464,7 @@ static void dopr_outch(int c) { - if (end == 0 || output < end) + if (end == NULL || output < end) { *output++ = c; } Modified: trunk/TEST/orig/evas/evas_xrender_xcb_main.c =================================================================== --- trunk/TEST/orig/evas/evas_xrender_xcb_main.c 2010-08-10 19:12:07 UTC (rev 50972) +++ trunk/TEST/orig/evas/evas_xrender_xcb_main.c 2010-08-10 19:24:38 UTC (rev 50973) @@ -124,7 +124,7 @@ iter_screen = xcb_setup_roots_iterator (xcb_get_setup (conn)); for (; iter_screen.rem; --screen_nbr, xcb_screen_next (&iter_screen)) - if (screen == 0) + if (screen == NULL) { screen = iter_screen.data; break; Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2010-08-10 19:12:07 UTC (rev 50972) +++ trunk/e/src/bin/e_actions.c 2010-08-10 19:24:38 UTC (rev 50973) @@ -485,7 +485,7 @@ bd = (E_Border *)obj; if (bd->fullscreen) e_border_unfullscreen(bd); - else if (params == 0 || *params == '\0') + else if (params == NULL || *params == '\0') e_border_fullscreen(bd, e_config->fullscreen_policy); else if (! strcmp(params, "resize")) e_border_fullscreen(bd, E_FULLSCREEN_RESIZE); Modified: trunk/ecore/src/lib/ecore/ecore_exe.c =================================================================== --- trunk/ecore/src/lib/ecore/ecore_exe.c 2010-08-10 19:12:07 UTC (rev 50972) +++ trunk/ecore/src/lib/ecore/ecore_exe.c 2010-08-10 19:24:38 UTC (rev 50973) @@ -1552,7 +1552,7 @@ if (shell == NULL) { /* Find users preferred shell. */ shell = getenv("SHELL"); - if (shell == 0) + if (shell == NULL) shell = "/bin/sh"; } errno = 0; Modified: trunk/embryo/src/bin/embryo_cc_sc1.c =================================================================== --- trunk/embryo/src/bin/embryo_cc_sc1.c 2010-08-10 19:12:07 UTC (rev 50972) +++ trunk/embryo/src/bin/embryo_cc_sc1.c 2010-08-10 19:24:38 UTC (rev 50973) @@ -1710,7 +1710,7 @@ * symbol instruction. */ } /* if */ - if ((sym = findglb(name)) != 0) + if ((sym = findglb(name)) != NULL) { /* already in symbol table? */ if (sym->ident != iFUNCTN) { @@ -2517,7 +2517,7 @@ sym->dim.arglist = (arginfo *) realloc(sym->dim.arglist, (argcnt + 2) * sizeof(arginfo)); - if (sym->dim.arglist == 0) + if (sym->dim.arglist == NULL) error(103); /* insufficient memory */ sym->dim.arglist[argcnt] = arg; sym->dim.arglist[argcnt + 1].ident = 0; /* keep the list @@ -2554,7 +2554,7 @@ sym->dim.arglist = (arginfo *) realloc(sym->dim.arglist, (argcnt + 2) * sizeof(arginfo)); - if (sym->dim.arglist == 0) + if (sym->dim.arglist == NULL) error(103); /* insufficient memory */ sym->dim.arglist[argcnt + 1].ident = 0; /* keep the list * terminated */ Modified: trunk/embryo/src/bin/embryo_cc_sc3.c =================================================================== --- trunk/embryo/src/bin/embryo_cc_sc3.c 2010-08-10 19:12:07 UTC (rev 50972) +++ trunk/embryo/src/bin/embryo_cc_sc3.c 2010-08-10 19:24:38 UTC (rev 50973) @@ -1723,7 +1723,7 @@ if (tok == tSYMBOL && !findconst(st)) { /* first look for a local variable */ - if ((sym = findloc(st)) != 0) + if ((sym = findloc(st)) != NULL) { if (sym->ident == iLABEL) { @@ -1745,7 +1745,7 @@ } /* if */ } /* if */ /* now try a global variable */ - if ((sym = findglb(st)) != 0) + if ((sym = findglb(st)) != NULL) { if (sym->ident == iFUNCTN || sym->ident == iREFFUNC) { @@ -2371,7 +2371,7 @@ symbol *sym; tok = lex(&val, &st); - if (tok == tSYMBOL && (sym = findconst(st)) != 0) + if (tok == tSYMBOL && (sym = findconst(st)) != NULL) { lval->constval = sym->addr; const1(lval->constval); Modified: trunk/eterm/libast/src/snprintf.c =================================================================== --- trunk/eterm/libast/src/snprintf.c 2010-08-10 19:12:07 UTC (rev 50972) +++ trunk/eterm/libast/src/snprintf.c 2010-08-10 19:24:38 UTC (rev 50973) @@ -239,7 +239,7 @@ int padlen, strlen, i, c; /* amount to pad */ zpad = 0; - if (value == 0) { + if (value == NULL) { value = "<NULL>"; } if (precision > 0) { @@ -382,7 +382,7 @@ static void dopr_outch(int c) { - if (end == 0 || output < end) { + if (end == NULL || output < end) { *output++ = c; } } |