mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add NO_C99_FORMAT to support older compilers.

Browse Source 
The NO_C99_FORMAT macro allows compilers that lack support for the
ll,hh,j,z,t size specifiers (eg. gcc 2.95.2) to adapt the code to avoid
runtime errors in the formatted IO functions.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Ramsay Allan Jones
2006-07-30 16:38:28 +01:00
committed by Junio C Hamano
parent 446c6faec6
commit 579d1fbfaf
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mktag.c
View File

@ -39,6 +39,12 @@ static int verify_object(unsigned char *sha1, const char *expected_type)
return ret;
}
#ifdef NO_C99_FORMAT
#define PD_FMT "%d"
#else
#define PD_FMT "%td"
#endif
static int verify_tag(char *buffer, unsigned long size)
{
int typelen;
@ -67,15 +73,15 @@ static int verify_tag(char *buffer, unsigned long size)
/* Verify tag-line */
tag_line = strchr(type_line, '\n');
if (!tag_line)
return error("char%td: could not find next \"\\n\"", type_line - buffer);
return error("char" PD_FMT ": could not find next \"\\n\"", type_line - buffer);
tag_line++;
if (memcmp(tag_line, "tag ", 4) || tag_line[4] == '\n')
return error("char%td: no \"tag \" found", tag_line - buffer);
return error("char" PD_FMT ": no \"tag \" found", tag_line - buffer);
/* Get the actual type */
typelen = tag_line - type_line - strlen("type \n");
if (typelen >= sizeof(type))
return error("char%td: type too long", type_line+5 - buffer);
return error("char" PD_FMT ": type too long", type_line+5 - buffer);
memcpy(type, type_line+5, typelen);
type[typelen] = 0;
@ -92,14 +98,14 @@ static int verify_tag(char *buffer, unsigned long size)
break;
if (c > ' ')
continue;
return error("char%td: could not verify tag name", tag_line - buffer);
return error("char" PD_FMT ": could not verify tag name", tag_line - buffer);
}
/* Verify the tagger line */
tagger_line = tag_line;
if (memcmp(tagger_line, "tagger", 6) || (tagger_line[6] == '\n'))
return error("char%td: could not find \"tagger\"", tagger_line - buffer);
return error("char" PD_FMT ": could not find \"tagger\"", tagger_line - buffer);
/* TODO: check for committer info + blank line? */
/* Also, the minimum length is probably + "tagger .", or 63+8=71 */
@ -108,6 +114,8 @@ static int verify_tag(char *buffer, unsigned long size)
return 0;
}
#undef PD_FMT
int main(int argc, char **argv)
{
unsigned long size = 4096;