mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-03-31 17:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Silence some conversion warnings in ncgen generated files

Browse Source
This commit is contained in:
Peter Hill 2024-03-14 16:00:56 +00:00
parent c74b78efc6
commit 0d354152ca
No known key found for this signature in database
GPG Key ID: 0C6B9742E72848EE
7 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ncgen/escapes.c
View File

@ -604,7 +604,7 @@ unescapeoct(const char* s)
int
unescape(
const char *yytext, /* text to unescape */
int yyleng, /* length of yytext */
size_t yyleng, /* length of yytext */
int isident, /* Is this an identifier? */
char** sp /* Return the unescaped version of yytext */
)

2
ncgen/genlib.h
View File

@ -59,7 +59,7 @@ extern void nestedfqn(Symbol* sym);
extern void attfqn(Symbol* sym);
/* from: escapes.c */
extern int unescape(const char*, int, int, char**);
extern int unescape(const char*, size_t, int, char**);
extern int unescapeoct(const char* s);
extern int unescapehex(const char* s);
extern char* cescapifychar(char c, int quote);

2
ncgen/ncgen.h
View File

@ -119,7 +119,7 @@ typedef struct Specialdata {
Datalist* _Fillvalue; /* This is a per-type ; points to the _FillValue attribute node */
int _Storage; /* NC_CHUNKED | NC_CONTIGUOUS | NC_COMPACT*/
size_t* _ChunkSizes; /* NULL => defaults*/
int nchunks; /* |_Chunksize| ; 0 => not specified*/
size_t nchunks; /* |_Chunksize| ; 0 => not specified*/
int _Fletcher32; /* 1=>fletcher32*/
int _DeflateLevel; /* 0-9 => level*/
int _Shuffle; /* 0 => false, 1 => true*/

26
ncgen/ncgen.l
View File

@ -241,13 +241,13 @@ yyerror("string too long, truncated\n");
yytext[MAXTRST-1] = '\0';
}
*/
len = unescape((char *)yytext+1,yyleng-2,!ISIDENT,&s);
len = unescape((char *)yytext+1,(size_t)(yyleng-2),!ISIDENT,&s);
if(len < 0) {
snprintf(errstr, sizeof(errstr),"Illegal character: %s",yytext);
yyerror(errstr);
}
bbClear(lextext);
bbAppendn(lextext,s,len);
bbAppendn(lextext,s,(size_t)len);
bbNull(lextext);
if(s) efree(s);
return lexdebug(TERMSTRING);
@ -257,11 +257,11 @@ yytext[MAXTRST-1] = '\0';
char* p = yytext+2;
int len = yyleng - 2;
bbClear(lextext);
bbAppendn(lextext,p,len);
bbAppendn(lextext,p,(size_t)len);
if((len % 2) == 1) bbAppend(lextext,'0');
bbNull(lextext);
/* convert all chars to lower case */
for(p=bbContents(lextext);(int)*p;p++) *p = tolower(*p);
for(p=bbContents(lextext);*p;p++) *p = (char)tolower((int)*p);
return lexdebug(OPAQUESTRING);
}
@ -342,7 +342,7 @@ NIL|nil|Nil {
{PATH} {
bbClear(lextext);
bbAppendn(lextext,(char*)yytext,yyleng+1); /* include null */
bbAppendn(lextext,(char*)yytext,(size_t)yyleng+1); /* include null */
bbNull(lextext);
yylval.sym = makepath(bbContents(lextext));
return lexdebug(PATH);
@ -351,7 +351,7 @@ NIL|nil|Nil {
{SPECIAL} {struct Specialtoken* st;
bbClear(lextext);
bbAppendn(lextext,(char*)yytext,yyleng+1); /* include null */
bbAppendn(lextext,(char*)yytext,(size_t)yyleng+1); /* include null */
bbNull(lextext);
for(st=specials;st->name;st++) {
if(strcmp(bbContents(lextext),st->name)==0) {return lexdebug(st->token);}
@ -360,11 +360,11 @@ NIL|nil|Nil {
}
<TEXT>{DATASETID} {
int c;
char c;
char* p; char* q;
/* copy the trimmed name */
bbClear(lextext);
bbAppendn(lextext,(char*)yytext,yyleng+1); /* include null */
bbAppendn(lextext,(char*)yytext,(size_t)yyleng+1); /* include null */
bbNull(lextext);
p = bbContents(lextext);
q = p;
@ -378,7 +378,7 @@ NIL|nil|Nil {
{ID} { char* id = NULL; size_t len;
len = strlen(yytext);
len = unescape(yytext,len,ISIDENT,&id);
len = (size_t)unescape(yytext,len,ISIDENT,&id);
if(NCSTREQ(id, FILL_STRING)) {
efree(id);
return lexdebug(FILLMARKER);
@ -491,7 +491,7 @@ done: return 0;
/* convert to an unsigned long long */
uint64_val = 0;
while((c=*hex++)) {
unsigned int hexdigit = (c <= '9'?(c-'0'):(c-'a')+0xa);
unsigned int hexdigit = (unsigned int)(c <= '9'?(c-'0'):(c-'a')+0xa);
uint64_val = ((uint64_val << 4) | hexdigit);
}
switch (tag) {
@ -538,7 +538,7 @@ done: return 0;
snprintf(errstr, sizeof(errstr),"bad octal character constant: %s",(char*)yytext);
yyerror(errstr);
}
byte_val = (unsigned int)oct;
byte_val = (signed char)oct;
return lexdebug(BYTE_CONST);
}
\'\\[xX][0-9a-fA-F][0-9a-fA-F]\' {
@ -547,7 +547,7 @@ done: return 0;
snprintf(errstr, sizeof(errstr),"bad hex character constant: %s",(char*)yytext);
yyerror(errstr);
}
byte_val = (unsigned int)hex;
byte_val = (signed char)hex;
return lexdebug(BYTE_CONST);
}
\'\\.\' {
@ -716,7 +716,7 @@ downconvert(unsigned long long uint64, int* tagp, int isneg, int hasU)
{
nc_type nct = NC_NAT;
int tag = *tagp;
int bit63set = (uint64 >> 63);
int bit63set = (int)(uint64 >> 63);
long long int64 = *((long long*)&uint64);
if(isneg && hasU) {

8
ncgen/ncgen.y
View File

@ -374,7 +374,7 @@ opaquedecl: OPAQUE_ '(' INT_CONST ')' typename
$5->objectclass=NC_TYPE;
$5->subclass=NC_OPAQUE;
$5->typ.typecode=NC_OPAQUE;
$5->typ.size=int32_val;
$5->typ.size=(size_t)int32_val;
(void)ncaux_class_alignment(NC_OPAQUE,&$5->typ.alignment);
}
;
@ -558,7 +558,7 @@ varspec: varident dimspec
count = NC_MAX_VAR_DIMS - 1;
stacklen = stackbase + count;
}
dimset.ndims = count;
dimset.ndims = (int)count;
/* extract the actual dimensions*/
if(dimset.ndims > 0) {
for(i=0;i<count;i++) {
@ -618,7 +618,7 @@ fieldspec:
count = NC_MAX_VAR_DIMS - 1;
stacklen = stackbase + count;
}
dimset.ndims = count;
dimset.ndims = (int)count;
if(count > 0) {
/* extract the actual dimensions*/
for(i=0;i<count;i++) {
@ -668,7 +668,7 @@ fielddim:
$$ = install(anon);
$$->objectclass = NC_DIM;
$$->dim.isconstant = 1;
$$->dim.declsize = int32_val;
$$->dim.declsize = (size_t)int32_val;
}
;

50
ncgen/ncgenl.c
View File

@ -2079,13 +2079,13 @@ yyerror("string too long, truncated\n");
yytext[MAXTRST-1] = '\0';
}
*/
len = unescape((char *)yytext+1,yyleng-2,!ISIDENT,&s);
len = unescape((char *)yytext+1,(size_t)(yyleng-2),!ISIDENT,&s);
if(len < 0) {
snprintf(errstr,sizeof(errstr),"Illegal character: %s",yytext);
snprintf(errstr, sizeof(errstr),"Illegal character: %s",yytext);
yyerror(errstr);
}
bbClear(lextext);
bbAppendn(lextext,s,len);
bbAppendn(lextext,s,(size_t)len);
bbNull(lextext);
if(s) efree(s);
return lexdebug(TERMSTRING);
@ -2098,11 +2098,11 @@ YY_RULE_SETUP
char* p = yytext+2;
int len = yyleng - 2;
bbClear(lextext);
bbAppendn(lextext,p,len);
bbAppendn(lextext,p,(size_t)len);
if((len % 2) == 1) bbAppend(lextext,'0');
bbNull(lextext);
/* convert all chars to lower case */
for(p=bbContents(lextext);(int)*p;p++) *p = tolower(*p);
for(p=bbContents(lextext);*p;p++) *p = (char)tolower((int)*p);
return lexdebug(OPAQUESTRING);
}
YY_BREAK
@ -2304,7 +2304,7 @@ YY_RULE_SETUP
#line 343 "ncgen/ncgen.l"
{
bbClear(lextext);
bbAppendn(lextext,(char*)yytext,yyleng+1); /* include null */
bbAppendn(lextext,(char*)yytext,(size_t)yyleng+1); /* include null */
bbNull(lextext);
yylval.sym = makepath(bbContents(lextext));
return lexdebug(PATH);
@ -2315,7 +2315,7 @@ YY_RULE_SETUP
#line 352 "ncgen/ncgen.l"
{struct Specialtoken* st;
bbClear(lextext);
bbAppendn(lextext,(char*)yytext,yyleng+1); /* include null */
bbAppendn(lextext,(char*)yytext,(size_t)yyleng+1); /* include null */
bbNull(lextext);
for(st=specials;st->name;st++) {
if(strcmp(bbContents(lextext),st->name)==0) {return lexdebug(st->token);}
@ -2328,11 +2328,11 @@ case 39:
YY_RULE_SETUP
#line 362 "ncgen/ncgen.l"
{
int c;
char c;
char* p; char* q;
/* copy the trimmed name */
bbClear(lextext);
bbAppendn(lextext,(char*)yytext,yyleng+1); /* include null */
bbAppendn(lextext,(char*)yytext,(size_t)yyleng+1); /* include null */
bbNull(lextext);
p = bbContents(lextext);
q = p;
@ -2349,7 +2349,7 @@ YY_RULE_SETUP
#line 379 "ncgen/ncgen.l"
{ char* id = NULL; size_t len;
len = strlen(yytext);
len = unescape(yytext,len,ISIDENT,&id);
len = (size_t)unescape(yytext,len,ISIDENT,&id);
if(NCSTREQ(id, FILL_STRING)) {
efree(id);
return lexdebug(FILLMARKER);
@ -2385,7 +2385,7 @@ YY_RULE_SETUP
/* capture the tag string */
tag = collecttag(pos,&stag);
if(tag == NC_NAT) {
snprintf(errstr,sizeof(errstr),"Illegal integer suffix: %s",stag);
snprintf(errstr, sizeof(errstr),"Illegal integer suffix: %s",stag);
yyerror(errstr);
goto done;
}
@ -2407,13 +2407,13 @@ YY_RULE_SETUP
radix = 10;
if(isneg && hasU) {
snprintf(errstr,sizeof(errstr),"Unsigned integer cannot be signed: %s",ncgtext);
snprintf(errstr, sizeof(errstr),"Unsigned integer cannot be signed: %s",ncgtext);
yyerror(errstr);
goto done;
}
uint64_val = parseULL(radix, pos,&fail);
if(fail) {
snprintf(errstr,sizeof(errstr),"integer constant out of range: %s",ncgtext);
snprintf(errstr, sizeof(errstr),"integer constant out of range: %s",ncgtext);
yyerror(errstr);
goto done;
}
@ -2427,7 +2427,7 @@ YY_RULE_SETUP
case NC_FORMAT_64BIT_OFFSET:
case NC_FORMAT_NETCDF4_CLASSIC:
if(nct > NC_INT) {
snprintf(errstr,sizeof(errstr),"Illegal integer constant for classic format: %s",ncgtext);
snprintf(errstr, sizeof(errstr),"Illegal integer constant for classic format: %s",ncgtext);
yyerror(errstr);
goto done;
}
@ -2456,7 +2456,7 @@ YY_RULE_SETUP
/* capture the tag string */
tag = collecttag(yytext,&stag);
if(tag == NC_NAT) {
snprintf(errstr,sizeof(errstr),"Illegal integer suffix: %s",stag);
snprintf(errstr, sizeof(errstr),"Illegal integer suffix: %s",stag);
yyerror(errstr);
//goto done;
return 0;
@ -2468,7 +2468,7 @@ YY_RULE_SETUP
/* convert to an unsigned long long */
uint64_val = 0;
while((c=*hex++)) {
unsigned int hexdigit = (c <= '9'?(c-'0'):(c-'a')+0xa);
unsigned int hexdigit = (unsigned int)(c <= '9'?(c-'0'):(c-'a')+0xa);
uint64_val = ((uint64_val << 4) | hexdigit);
}
switch (tag) {
@ -2484,7 +2484,7 @@ YY_RULE_SETUP
break;
default: /* should never happen */
if (sscanf((char*)yytext, "%i", &uint32_val) != 1) {
snprintf(errstr,sizeof(errstr),"bad unsigned int constant: %s",(char*)yytext);
snprintf(errstr, sizeof(errstr),"bad unsigned int constant: %s",(char*)yytext);
yyerror(errstr);
}
token = UINT_CONST;
@ -2497,7 +2497,7 @@ YY_RULE_SETUP
#line 517 "ncgen/ncgen.l"
{
if (sscanf((char*)yytext, "%le", &double_val) != 1) {
snprintf(errstr,sizeof(errstr),"bad long or double constant: %s",(char*)yytext);
snprintf(errstr, sizeof(errstr),"bad long or double constant: %s",(char*)yytext);
yyerror(errstr);
}
return lexdebug(DOUBLE_CONST);
@ -2508,7 +2508,7 @@ YY_RULE_SETUP
#line 524 "ncgen/ncgen.l"
{
if (sscanf((char*)yytext, "%e", &float_val) != 1) {
snprintf(errstr,sizeof(errstr),"bad float constant: %s",(char*)yytext);
snprintf(errstr, sizeof(errstr),"bad float constant: %s",(char*)yytext);
yyerror(errstr);
}
return lexdebug(FLOAT_CONST);
@ -2529,10 +2529,10 @@ YY_RULE_SETUP
{
int oct = unescapeoct(&yytext[2]);
if(oct < 0) {
snprintf(errstr,sizeof(errstr),"bad octal character constant: %s",(char*)yytext);
snprintf(errstr, sizeof(errstr),"bad octal character constant: %s",(char*)yytext);
yyerror(errstr);
}
byte_val = (unsigned int)oct;
byte_val = (signed char)oct;
return lexdebug(BYTE_CONST);
}
YY_BREAK
@ -2542,10 +2542,10 @@ YY_RULE_SETUP
{
int hex = unescapehex(&yytext[3]);
if(byte_val < 0) {
snprintf(errstr,sizeof(errstr),"bad hex character constant: %s",(char*)yytext);
snprintf(errstr, sizeof(errstr),"bad hex character constant: %s",(char*)yytext);
yyerror(errstr);
}
byte_val = (unsigned int)hex;
byte_val = (signed char)hex;
return lexdebug(BYTE_CONST);
}
YY_BREAK
@ -3681,7 +3681,7 @@ makepath(char* text0)
refsym = lookupingroup(NC_GRP,ident,container);
if(!lastident) {
if(refsym == NULL) {
snprintf(errstr,sizeof(errstr),"Undefined or forward referenced group: %s",ident);
snprintf(errstr, sizeof(errstr),"Undefined or forward referenced group: %s",ident);
yyerror(errstr);
refsym = rootgroup;
} else
@ -3750,7 +3750,7 @@ downconvert(unsigned long long uint64, int* tagp, int isneg, int hasU)
{
nc_type nct = NC_NAT;
int tag = *tagp;
int bit63set = (uint64 >> 63);
int bit63set = (int)(uint64 >> 63);
long long int64 = *((long long*)&uint64);
if(isneg && hasU) {

14
ncgen/ncgeny.c
View File

@ -1543,7 +1543,7 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
return -1;
}
/* Avoid snprintf, as that infringes on the user's name space.
/* Avoid sprintf, as that infringes on the user's name space.
Don't have undefined behavior even if the translation
produced a string with the wrong number of "%s"s. */
{
@ -1985,7 +1985,7 @@ yyreduce:
(yyvsp[0].sym)->objectclass=NC_TYPE;
(yyvsp[0].sym)->subclass=NC_OPAQUE;
(yyvsp[0].sym)->typ.typecode=NC_OPAQUE;
(yyvsp[0].sym)->typ.size=int32_val;
(yyvsp[0].sym)->typ.size=(size_t)int32_val;
(void)ncaux_class_alignment(NC_OPAQUE,&(yyvsp[0].sym)->typ.alignment);
}
#line 1992 "ncgeny.c"
@ -2279,7 +2279,7 @@ fprintf(stderr,"dimension: %s = UNLIMITED\n",(yyvsp[-2].sym)->name);
count = NC_MAX_VAR_DIMS - 1;
stacklen = stackbase + count;
}
dimset.ndims = count;
dimset.ndims = (int)count;
/* extract the actual dimensions*/
if(dimset.ndims > 0) {
for(i=0;i<count;i++) {
@ -2362,7 +2362,7 @@ fprintf(stderr,"dimension: %s = UNLIMITED\n",(yyvsp[-2].sym)->name);
count = NC_MAX_VAR_DIMS - 1;
stacklen = stackbase + count;
}
dimset.ndims = count;
dimset.ndims = (int)count;
if(count > 0) {
/* extract the actual dimensions*/
for(i=0;i<count;i++) {
@ -2409,7 +2409,7 @@ fprintf(stderr,"dimension: %s = UNLIMITED\n",(yyvsp[-2].sym)->name);
{ /* Anonymous integer dimension.
Can only occur in type definitions*/
char anon[32];
snprintf(anon,sizeof(anon),"const%u",uint32_val);
snprintf(anon, sizeof(anon),"const%u",uint32_val);
(yyval.sym) = install(anon);
(yyval.sym)->objectclass = NC_DIM;
(yyval.sym)->dim.isconstant = 1;
@ -2427,11 +2427,11 @@ fprintf(stderr,"dimension: %s = UNLIMITED\n",(yyvsp[-2].sym)->name);
derror("field dimension must be positive");
YYABORT;
}
snprintf(anon,sizeof(anon),"const%d",int32_val);
snprintf(anon, sizeof(anon),"const%d",int32_val);
(yyval.sym) = install(anon);
(yyval.sym)->objectclass = NC_DIM;
(yyval.sym)->dim.isconstant = 1;
(yyval.sym)->dim.declsize = int32_val;
(yyval.sym)->dim.declsize = (size_t)int32_val;
}
#line 2437 "ncgeny.c"
break;