NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit20559a8

committed

More zic cleanup.

The workaround the IANA guys chose to get rid of the clang warningwe'd silenced in commit23ed2ba turns out not to satisfy Coverity.Go back to the previous solution, ie, remove the useless comparisonto SIZE_MAX. (In principle, there could be machines out there whereit's not useless because ptrdiff_t is wider than size_t. But the wholething is pretty academic anyway, as we could never approach this limitfor any sane estimate of the amount of data that zic will ever be askedto work with.)Also, s/lineno/lineno_t/g, because if we accept their decision to startusing "lineno" as a typedef, it is going to have very unpleasantconsequences in our next pgindent run. Noted that while fooling withpltcl yesterday.

1 parent5c24c61 commit20559a8Copy full SHA for 20559a8

File tree

1 file changed

+11

-12

lines changed

src/timezone
- zic.c

1 file changed

+11

-12

lines changed

`‎src/timezone/zic.c`

Lines changed: 11 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,13 @@ static ptrdiff_t const PTRDIFF_MAX = MAXVAL(ptrdiff_t, TYPE_BIT(ptrdiff_t));`
`48`	`48`	`#endif`
`49`	`49`
`50`	`50`	`/* The type and printf format for line numbers. */`
`51`		`-typedefintlineno;`
	`51`	`+typedefintlineno_t;`
`52`	`52`	`#definePRIdLINENO "d"`
`53`	`53`
`54`	`54`	`structrule`
`55`	`55`	`{`
`56`	`56`	`constchar*r_filename;`
`57`		`-linenor_linenum;`
	`57`	`+lineno_tr_linenum;`
`58`	`58`	`constchar*r_name;`
`59`	`59`
`60`	`60`	`zic_tr_loyear;/* for example, 1986 */`
`@@ -91,7 +91,7 @@ struct rule`
`91`	`91`	`structzone`
`92`	`92`	`{`
`93`	`93`	`constchar*z_filename;`
`94`		`-linenoz_linenum;`
	`94`	`+lineno_tz_linenum;`
`95`	`95`
`96`	`96`	`constchar*z_name;`
`97`	`97`	`zic_tz_gmtoff;`
`@@ -169,7 +169,7 @@ static intleapcnt;`
`169`	`169`	`staticboolleapseen;`
`170`	`170`	`staticzic_tleapminyear;`
`171`	`171`	`staticzic_tleapmaxyear;`
`172`		`-staticlinenolinenum;`
	`172`	`+staticlineno_tlinenum;`
`173`	`173`	`staticintmax_abbrvar_len=PERCENT_Z_LEN_BOUND;`
`174`	`174`	`staticintmax_format_len;`
`175`	`175`	`staticzic_tmax_year;`
`@@ -178,7 +178,7 @@ static bool noise;`
`178`	`178`	`staticboolprint_abbrevs;`
`179`	`179`	`staticzic_tprint_cutoff;`
`180`	`180`	`staticconstchar*rfilename;`
`181`		`-staticlinenorlinenum;`
	`181`	`+staticlineno_trlinenum;`
`182`	`182`	`staticconstchar*progname;`
`183`	`183`	`staticptrdiff_ttimecnt;`
`184`	`184`	`staticptrdiff_ttimecnt_alloc;`
`@@ -276,7 +276,7 @@ static ptrdiff_t nzones_alloc;`
`276`	`276`	`structlink`
`277`	`277`	`{`
`278`	`278`	`constchar*l_filename;`
`279`		`-linenol_linenum;`
	`279`	`+lineno_tl_linenum;`
`280`	`280`	`constchar*l_from;`
`281`	`281`	`constchar*l_to;`
`282`	`282`	`};`
`@@ -430,14 +430,13 @@ ecpyalloc(char const * str)`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`staticvoid*`
`433`		`-growalloc(voidptr,size_titemsize,ptrdiff_tnitems,ptrdiff_tnitems_alloc)`
	`433`	`+growalloc(voidptr,size_titemsize,ptrdiff_tnitems,ptrdiff_tnitems_alloc)`
`434`	`434`	`{`
`435`	`435`	`if (nitems<*nitems_alloc)`
`436`	`436`	`returnptr;`
`437`	`437`	`else`
`438`	`438`	`{`
`439`		`-ptrdiff_tnitems_max=PTRDIFF_MAX-WORK_AROUND_QTBUG_53071;`
`440`		`-ptrdiff_tamax=nitems_max<SIZE_MAX ?nitems_max :SIZE_MAX;`
	`439`	`+ptrdiff_tamax=PTRDIFF_MAX-WORK_AROUND_QTBUG_53071;`
`441`	`440`
`442`	`441`	`if ((amax-1) /32<nitems_alloc)`
`443`	`442`	`memory_exhausted(_("integer overflow"));`
`@@ -451,7 +450,7 @@ growalloc(void ptr, size_t itemsize, ptrdiff_t nitems, ptrdiff_t nitems_alloc`
`451`	`450`	`*/`
`452`	`451`
`453`	`452`	`staticvoid`
`454`		`-eats(charconstname,linenonum,charconstrname,linenornum)`
	`453`	`+eats(charconstname,lineno_tnum,charconstrname,lineno_trnum)`
`455`	`454`	`{`
`456`	`455`	`filename=name;`
`457`	`456`	`linenum=num;`
`@@ -460,7 +459,7 @@ eats(char const * name, lineno num, char const * rname, lineno rnum)`
`460`	`459`	`}`
`461`	`460`
`462`	`461`	`staticvoid`
`463`		`-eat(charconst*name,linenonum)`
	`462`	`+eat(charconst*name,lineno_tnum)`
`464`	`463`	`{`
`465`	`464`	`eats(name,num,NULL,-1);`
`466`	`465`	`}`
`@@ -1157,7 +1156,7 @@ infile(const char *name)`
`1157`	`1156`	`conststructlookup*lp;`
`1158`	`1157`	`intnfields;`
`1159`	`1158`	`boolwantcont;`
`1160`		`-linenonum;`
	`1159`	`+lineno_tnum;`
`1161`	`1160`	`charbuf[BUFSIZ];`
`1162`	`1161`
`1163`	`1162`	`if (strcmp(name,"-")==0)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit20559a8

File tree

1 file changed

1 file changed

`‎src/timezone/zic.c`

0 commit comments