NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7821f72

committed

Clean up overly paranoid checks in mac8.c

Andres' compiler points out, quite correctly, that there's no need forsome of the overly paranoid checks which were put into mac8.c. Removethose, as they're useless, add some comments and make a few other minorimprovements- reduce the size of hexlookup by making it a char arrayinstead of an int array, and pass in the ptr location directly insteadof making hex2_to_uchar re-calculate the location based off the offsetevery time.

1 parent6977b8b commit7821f72Copy full SHA for 7821f72

File tree

1 file changed

+25

-17

lines changed

src/backend/utils/adt
- mac8.c

1 file changed

+25

-17

lines changed

`‎src/backend/utils/adt/mac8.c`

Lines changed: 25 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@`
`35`	`35`	`#definelobits(addr) \`
`36`	`36`	`((unsigned long)(((addr)->e<<24) \| ((addr)->f<<16) \| ((addr)->g<<8) \| ((addr)->h)))`
`37`	`37`
`38`		`-staticunsignedcharhex2_to_uchar(constchar*str,intoffset);`
	`38`	`+staticunsignedcharhex2_to_uchar(constcharstr,constcharptr);`
`39`	`39`
`40`		`-staticconstinthexlookup[128]= {`
	`40`	`+staticconstcharhexlookup[128]= {`
`41`	`41`	`-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,`
`42`	`42`	`-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,`
`43`	`43`	`-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,`
`@@ -48,31 +48,39 @@ static const int hexlookup[128] = {`
`48`	`48`	`-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,`
`49`	`49`	`};`
`50`	`50`
	`51`	`+/*`
	`52`	`+ * hex2_to_uchar - convert 2 hex digits to a byte (unsigned char)`
	`53`	`+ *`
	`54`	`+ * This will ereport() if the end of the string is reached ('\0' found), or if`
	`55`	`+ * either character is not a valid hex digit.`
	`56`	`+ *`
	`57`	`+ * ptr is the pointer to where the digits to convert are in the string, str is`
	`58`	`+ * the entire string, which is used only for error reporting.`
	`59`	`+ */`
`51`	`60`	`staticinlineunsignedchar`
`52`		`-hex2_to_uchar(constchar*str,intoffset)`
	`61`	`+hex2_to_uchar(constcharptr,constcharstr)`
`53`	`62`	`{`
`54`	`63`	`unsignedcharret=0;`
`55`		`-intlookup;`
`56`		`-constchar*ptr=str+offset;`
	`64`	`+charlookup;`
`57`	`65`
`58`	`66`	`/* Handle the first character */`
`59`		`-if (ptr<0\|\|ptr >=127)`
	`67`	`+if (*ptr<0)`
`60`	`68`	`gotoinvalid_input;`
`61`	`69`
`62`	`70`	`lookup=hexlookup[(unsignedchar)*ptr];`
`63`		`-if (lookup<0\|\|lookup>15)`
	`71`	`+if (lookup<0)`
`64`	`72`	`gotoinvalid_input;`
`65`	`73`
`66`	`74`	`ret=lookup <<4;`
`67`	`75`
`68`	`76`	`/* Move to the second character */`
`69`	`77`	`ptr++;`
`70`	`78`
`71`		`-if (ptr<0\|\|ptr>127)`
	`79`	`+if (*ptr<0)`
`72`	`80`	`gotoinvalid_input;`
`73`	`81`
`74`	`82`	`lookup=hexlookup[(unsignedchar)*ptr];`
`75`		`-if (lookup<0\|\|lookup>15)`
	`83`	`+if (lookup<0)`
`76`	`84`	`gotoinvalid_input;`
`77`	`85`
`78`	`86`	`ret+=lookup;`
`@@ -128,28 +136,28 @@ macaddr8_in(PG_FUNCTION_ARGS)`
`128`	`136`	`switch (count)`
`129`	`137`	`{`
`130`	`138`	`case1:`
`131`		`-a=hex2_to_uchar(str,ptr-str);`
	`139`	`+a=hex2_to_uchar(ptr,str);`
`132`	`140`	`break;`
`133`	`141`	`case2:`
`134`		`-b=hex2_to_uchar(str,ptr-str);`
	`142`	`+b=hex2_to_uchar(ptr,str);`
`135`	`143`	`break;`
`136`	`144`	`case3:`
`137`		`-c=hex2_to_uchar(str,ptr-str);`
	`145`	`+c=hex2_to_uchar(ptr,str);`
`138`	`146`	`break;`
`139`	`147`	`case4:`
`140`		`-d=hex2_to_uchar(str,ptr-str);`
	`148`	`+d=hex2_to_uchar(ptr,str);`
`141`	`149`	`break;`
`142`	`150`	`case5:`
`143`		`-e=hex2_to_uchar(str,ptr-str);`
	`151`	`+e=hex2_to_uchar(ptr,str);`
`144`	`152`	`break;`
`145`	`153`	`case6:`
`146`		`-f=hex2_to_uchar(str,ptr-str);`
	`154`	`+f=hex2_to_uchar(ptr,str);`
`147`	`155`	`break;`
`148`	`156`	`case7:`
`149`		`-g=hex2_to_uchar(str,ptr-str);`
	`157`	`+g=hex2_to_uchar(ptr,str);`
`150`	`158`	`break;`
`151`	`159`	`case8:`
`152`		`-h=hex2_to_uchar(str,ptr-str);`
	`160`	`+h=hex2_to_uchar(ptr,str);`
`153`	`161`	`break;`
`154`	`162`	`default:`
`155`	`163`	`/* must be trailing garbage... */`

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!

Commit7821f72

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/mac8.c`

0 commit comments