dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied changes from SVN version 96 of official version of TinyScheme 

Eliminated some compiler warnings when compiled with pedantic.
This commit is contained in:
Kevin Cozens 2013-04-14 12:13:25 -04:00
parent 1235013177
commit 3a6ae1fe73
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plug-ins/script-fu/tinyscheme/scheme.c
View File

@ -1236,14 +1236,14 @@ static pointer mk_sharp_const(scheme *sc, char *name) {
return (sc->F); return (sc->F);
else if (*name == 'o') {/* #o (octal) */ else if (*name == 'o') {/* #o (octal) */
snprintf(tmp, STRBUFFSIZE, "0%s", name+1); snprintf(tmp, STRBUFFSIZE, "0%s", name+1);
sscanf(tmp, "%lo", &x); sscanf(tmp, "%lo", (long unsigned *)&x);
return (mk_integer(sc, x)); return (mk_integer(sc, x));
} else if (*name == 'd') { /* #d (decimal) */ } else if (*name == 'd') { /* #d (decimal) */
sscanf(name+1, "%ld", &x); sscanf(name+1, "%ld", (long int *)&x);
return (mk_integer(sc, x)); return (mk_integer(sc, x));
} else if (*name == 'x') { /* #x (hex) */ } else if (*name == 'x') { /* #x (hex) */
snprintf(tmp, STRBUFFSIZE, "0x%s", name+1); snprintf(tmp, STRBUFFSIZE, "0x%s", name+1);
sscanf(tmp, "%lx", &x); sscanf(tmp, "%lx", (long unsigned *)&x);
return (mk_integer(sc, x)); return (mk_integer(sc, x));
} else if (*name == 'b') { /* #b (binary) */ } else if (*name == 'b') { /* #b (binary) */
x = binary_decode(name+1); x = binary_decode(name+1);
@ -1260,7 +1260,7 @@ static pointer mk_sharp_const(scheme *sc, char *name) {
c='\t'; c='\t';
} else if(name[1]=='x' && name[2]!=0) { } else if(name[1]=='x' && name[2]!=0) {
int c1=0; int c1=0;
if(sscanf(name+2,"%x",&c1)==1 && c1 < UCHAR_MAX) { if(sscanf(name+2,"%x",(unsigned int *)&c1)==1 && c1 < UCHAR_MAX) {
c=c1; c=c1;
} else { } else {
return sc->NIL; return sc->NIL;
@ -2134,7 +2134,7 @@ static void atom2str(scheme *sc, pointer l, int f, char **pp, int *plen) {
/* r5rs says there must be a '.' (unless 'e'?) */ /* r5rs says there must be a '.' (unless 'e'?) */
f = strcspn(p, ".e"); f = strcspn(p, ".e");
if (p[f] == 0) { if (p[f] == 0) {
p[f] = '.'; // not found, so add '.0' at the end p[f] = '.'; /* not found, so add '.0' at the end */
p[f+1] = '0'; p[f+1] = '0';
p[f+2] = 0; p[f+2] = 0;
} }