oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

avoid C99 %z printf format spec in asn1 gen_decode

Browse Source 
Windows does not support the %z printf format specification
indicating the variable is of size_t.  In gen_decode the
variable 'depth' does not need to be of 'size_t'.  'unsigned int'
will suffice.

Change-Id: Ic56290ba702f7681d5e11f9d23bfa3eb7274dbbe
This commit is contained in:
Jeffrey Altman
2011-05-16 22:51:16 -04:00
committed by Jeffrey Altman
parent 9fb0ba53c5
commit 31de117576
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/asn1/gen_decode.c
View File

@@ -210,7 +210,7 @@ range_check(const char *name,
static int static int
decode_type (const char *name, const Type *t, int optional, decode_type (const char *name, const Type *t, int optional,
const char *forwstr, const char *tmpstr, const char *dertype, const char *forwstr, const char *tmpstr, const char *dertype,
size_t depth) unsigned int depth)
{ {
switch (t->type) { switch (t->type) {
case TType: { case TType: {
@@ -482,7 +482,7 @@ decode_type (const char *name, const Type *t, int optional,
tmpstr, tmpstr, typestring); tmpstr, tmpstr, typestring);
if(support_ber) if(support_ber)
fprintf(codefile, fprintf(codefile,
"int is_indefinite%zu;\n", depth); "int is_indefinite%u;\n", depth);
fprintf(codefile, "e = der_match_tag_and_length(p, len, %s, &%s, %s, " fprintf(codefile, "e = der_match_tag_and_length(p, len, %s, &%s, %s, "
"&%s_datalen, &l);\n", "&%s_datalen, &l);\n",
@@ -518,9 +518,9 @@ decode_type (const char *name, const Type *t, int optional,
tmpstr); tmpstr);
if(support_ber) if(support_ber)
fprintf (codefile, fprintf (codefile,
"if((is_indefinite%zu = _heim_fix_dce(%s_datalen, &len)) < 0)\n" "if((is_indefinite%u = _heim_fix_dce(%s_datalen, &len)) < 0)\n"
"{ e = ASN1_BAD_FORMAT; %s; }\n" "{ e = ASN1_BAD_FORMAT; %s; }\n"
"if (is_indefinite%zu) { if (len < 2) { e = ASN1_OVERRUN; %s; } len -= 2; }", "if (is_indefinite%u) { if (len < 2) { e = ASN1_OVERRUN; %s; } len -= 2; }",
depth, tmpstr, forwstr, depth, forwstr); depth, tmpstr, forwstr, depth, forwstr);
else else
fprintf(codefile, fprintf(codefile,
@@ -531,7 +531,7 @@ decode_type (const char *name, const Type *t, int optional,
decode_type (name, t->subtype, 0, forwstr, tname, ide, depth + 1); decode_type (name, t->subtype, 0, forwstr, tname, ide, depth + 1);
if(support_ber) if(support_ber)
fprintf(codefile, fprintf(codefile,
"if(is_indefinite%zu){\n" "if(is_indefinite%u){\n"
"len += 2;\n" "len += 2;\n"
"e = der_match_tag_and_length(p, len, " "e = der_match_tag_and_length(p, len, "
"(Der_class)0, &%s, UT_EndOfContent, " "(Der_class)0, &%s, UT_EndOfContent, "