NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit4608f35

committed

Fix a passel of signed vs unsigned char warnings.

1 parentcfd6c89 commit4608f35Copy full SHA for 4608f35

File tree

2 files changed

+10

-10

lines changed

contrib/xml2
- xpath.c
- xslt_proc.c

2 files changed

+10

-10

lines changed

`‎contrib/xml2/xpath.c‎`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ xml_encode_special_chars(PG_FUNCTION_ARGS)`
`209`	`209`
`210`	`210`	`pfree(ts);`
`211`	`211`
`212`		`-ressize=strlen(tt);`
	`212`	`+ressize=strlen((char*)tt);`
`213`	`213`	`tout= (text*)palloc(ressize+VARHDRSZ);`
`214`	`214`	`memcpy(VARDATA(tout),tt,ressize);`
`215`	`215`	`SET_VARSIZE(tout,ressize+VARHDRSZ);`
`@@ -265,7 +265,7 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,`
`265`	`265`
`266`	`266`	`/* If this isn't the last entry, write the plain sep. */`
`267`	`267`	`if (i< (nodeset->nodeNr)-1)`
`268`		`-xmlBufferWriteChar(buf,plainsep);`
	`268`	`+xmlBufferWriteChar(buf,(char*)plainsep);`
`269`	`269`	`}`
`270`	`270`	`else`
`271`	`271`	`{`
`@@ -604,12 +604,12 @@ pgxml_result_to_text(xmlXPathObjectPtr res,`
`604`	`604`
`605`	`605`	`default:`
`606`	`606`	`elog(NOTICE,"unsupported XQuery result: %d",res->type);`
`607`		`-xpresstr=xmlStrdup("<unsupported/>");`
	`607`	`+xpresstr=xmlStrdup((constxmlChar*)"<unsupported/>");`
`608`	`608`	`}`
`609`	`609`
`610`	`610`
`611`	`611`	`/* Now convert this result back to text */`
`612`		`-ressize=strlen(xpresstr);`
	`612`	`+ressize=strlen((char*)xpresstr);`
`613`	`613`	`xpres= (text*)palloc(ressize+VARHDRSZ);`
`614`	`614`	`memcpy(VARDATA(xpres),xpresstr,ressize);`
`615`	`615`	`SET_VARSIZE(xpres,ressize+VARHDRSZ);`
`@@ -659,8 +659,8 @@ xpath_table(PG_FUNCTION_ARGS)`
`659`	`659`
`660`	`660`	`char**values;`
`661`	`661`	`xmlChar**xpaths;`
`662`		`-xmlChar*pos;`
`663`		`-xmlChar*pathsep="\|";`
	`662`	`+char*pos;`
	`663`	`+constchar*pathsep="\|";`
`664`	`664`
`665`	`665`	`intnumpaths;`
`666`	`666`	`intret;`
`@@ -738,7 +738,7 @@ xpath_table(PG_FUNCTION_ARGS)`
`738`	`738`	`pos=xpathset;`
`739`	`739`	`do`
`740`	`740`	`{`
`741`		`-xpaths[numpaths]=pos;`
	`741`	`+xpaths[numpaths]=(xmlChar*)pos;`
`742`	`742`	`pos=strstr(pos,pathsep);`
`743`	`743`	`if (pos!=NULL)`
`744`	`744`	`{`
`@@ -893,15 +893,15 @@ xpath_table(PG_FUNCTION_ARGS)`
`893`	`893`
`894`	`894`	`default:`
`895`	`895`	`elog(NOTICE,"unsupported XQuery result: %d",res->type);`
`896`		`-resstr=xmlStrdup("<unsupported/>");`
	`896`	`+resstr=xmlStrdup((constxmlChar*)"<unsupported/>");`
`897`	`897`	`}`
`898`	`898`
`899`	`899`
`900`	`900`	`/*`
`901`	`901`	`* Insert this into the appropriate column in the`
`902`	`902`	`* result tuple.`
`903`	`903`	`*/`
`904`		`-values[j+1]=resstr;`
	`904`	`+values[j+1]=(char*)resstr;`
`905`	`905`	`}`
`906`	`906`	`xmlXPathFreeContext(ctxt);`
`907`	`907`	`}`

`‎contrib/xml2/xslt_proc.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ xslt_process(PG_FUNCTION_ARGS)`
`102`	`102`	`stylesheet=xsltParseStylesheetDoc(ssdoc);`
`103`	`103`	`}`
`104`	`104`	`else`
`105`		`-stylesheet=xsltParseStylesheetFile(GET_STR(ssheet));`
	`105`	`+stylesheet=xsltParseStylesheetFile((xmlChar*)GET_STR(ssheet));`
`106`	`106`
`107`	`107`
`108`	`108`	`if (stylesheet==NULL)`

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!

Commit4608f35

File tree

2 files changed

2 files changed

`‎contrib/xml2/xpath.c‎`

`‎contrib/xml2/xslt_proc.c‎`

0 commit comments