Date: Fri, 15 Apr 2016 12:37:55 +0800 From: Marcelo Araujo <araujobsdport@gmail.com> To: Marcelo Araujo <araujo@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r298033 - head/usr.sbin/tzsetup Message-ID: <CAOfEmZi_At=Q4D8yo3mN0uVrz%2BgUAL0cc=2ux4OjbVW7nC66pQ@mail.gmail.com> In-Reply-To: <201604150410.u3F4AlLP065717@repo.freebsd.org> References: <201604150410.u3F4AlLP065717@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
2016-04-15 12:10 GMT+08:00 Marcelo Araujo <araujo@freebsd.org>: > Author: araujo > Date: Fri Apr 15 04:10:47 2016 > New Revision: 298033 > URL: https://svnweb.freebsd.org/changeset/base/298033 > > Log: > Use NULL instead of 0 for pointers. > > fgetln(3) will returns NULL if cannot get a line from a stream. > strsep(3) it will returns NULL if the end of the string was reached. > jemalloc(3) malloc will returns NULL if it cannot allocate memory. > fgetln(3) it will returns NULL if it cannot get a line from a stream. > This last line (fgetln(3)) must be strchr(3) and it will return NULL if the character does not appear in the string. > > MFC after: 4 weeks > > Modified: > head/usr.sbin/tzsetup/tzsetup.c > > Modified: head/usr.sbin/tzsetup/tzsetup.c > > ============================================================================== > --- head/usr.sbin/tzsetup/tzsetup.c Fri Apr 15 03:50:33 2016 > (r298032) > +++ head/usr.sbin/tzsetup/tzsetup.c Fri Apr 15 04:10:47 2016 > (r298033) > @@ -344,7 +344,7 @@ read_iso3166_table(void) > err(1, "%s", path_iso3166); > lineno = 0; > > - while ((s = fgetln(fp, &len)) != 0) { > + while ((s = fgetln(fp, &len)) != NULL) { > lineno++; > if (s[len - 1] != '\n') > errx(1, "%s:%d: invalid format", path_iso3166, > lineno); > @@ -354,7 +354,7 @@ read_iso3166_table(void) > > /* Isolate the two-letter code. */ > t = strsep(&s, "\t"); > - if (t == 0 || strlen(t) != 2) > + if (t == NULL || strlen(t) != 2) > errx(1, "%s:%d: invalid format", path_iso3166, > lineno); > if (t[0] < 'A' || t[0] > 'Z' || t[1] < 'A' || t[1] > 'Z') > errx(1, "%s:%d: invalid code `%s'", path_iso3166, > @@ -362,10 +362,10 @@ read_iso3166_table(void) > > /* Now skip past the three-letter and numeric codes. */ > name = strsep(&s, "\t"); /* 3-let */ > - if (name == 0 || strlen(name) != 3) > + if (name == NULL || strlen(name) != 3) > errx(1, "%s:%d: invalid format", path_iso3166, > lineno); > name = strsep(&s, "\t"); /* numeric */ > - if (name == 0 || strlen(name) != 3) > + if (name == NULL || strlen(name) != 3) > errx(1, "%s:%d: invalid format", path_iso3166, > lineno); > > name = s; > @@ -407,7 +407,7 @@ add_zone_to_country(int lineno, const ch > path_zonetab, lineno); > > zp = malloc(sizeof(*zp)); > - if (zp == 0) > + if (zp == NULL) > errx(1, "malloc(%zu)", sizeof(*zp)); > > if (cp->nzones == 0) > @@ -483,7 +483,7 @@ read_zones(void) > err(1, "%s", path_zonetab); > lineno = 0; > > - while ((line = fgetln(fp, &len)) != 0) { > + while ((line = fgetln(fp, &len)) != NULL) { > lineno++; > if (line[len - 1] != '\n') > errx(1, "%s:%d: invalid format", path_zonetab, > lineno); > @@ -498,7 +498,7 @@ read_zones(void) > /* coord = */ strsep(&line, "\t"); /* Unused */ > file = strsep(&line, "\t"); > p = strchr(file, '/'); > - if (p == 0) > + if (p == NULL) > errx(1, "%s:%d: invalid zone name `%s'", > path_zonetab, > lineno, file); > contbuf[0] = '\0'; > @@ -558,7 +558,7 @@ make_menus(void) > continent_names[i].continent->menu = > malloc(sizeof(dialogMenuItem) * > continent_names[i].continent->nitems); > - if (continent_names[i].continent->menu == 0) > + if (continent_names[i].continent->menu == NULL) > errx(1, "malloc for continent menu"); > continent_names[i].continent->nitems = 0; > continents[i].prompt = continent_items[i].prompt; > > -- -- Marcelo Araujo (__)araujo@FreeBSD.org \\\'',)http://www.FreeBSD.org <http://www.freebsd.org/>; \/ \ ^ Power To Server. .\. /_)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOfEmZi_At=Q4D8yo3mN0uVrz%2BgUAL0cc=2ux4OjbVW7nC66pQ>