[SPEC2DEF]

- Fix warnings

svn path=/trunk/; revision=59537
This commit is contained in:
Thomas Faber 2013-07-20 11:40:04 +00:00
parent 29cb1bacd5
commit cb5bf8777e

View file

@ -10,7 +10,7 @@
typedef struct typedef struct
{ {
char *pcName; char *pcName;
size_t nNameLength; int nNameLength;
char *pcRedirection; char *pcRedirection;
int nRedirectionLength; int nRedirectionLength;
int nCallingConvention; int nCallingConvention;
@ -315,7 +315,7 @@ void
PrintName(FILE *fileDest, EXPORT *pexp, char *pszPrefix, int fRedir, int fDeco) PrintName(FILE *fileDest, EXPORT *pexp, char *pszPrefix, int fRedir, int fDeco)
{ {
char *pcName = fRedir ? pexp->pcRedirection : pexp->pcName; char *pcName = fRedir ? pexp->pcRedirection : pexp->pcName;
size_t nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength; int nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength;
/* Handle autoname */ /* Handle autoname */
if (nNameLength == 1 && pcName[0] == '@') if (nNameLength == 1 && pcName[0] == '@')
@ -649,10 +649,10 @@ ParseFile(char* pcStart, FILE *fileDest, PFNOUTLINE OutputLine)
{ {
/* Check for stdcall name */ /* Check for stdcall name */
char *p = strchr(pc, '@'); char *p = strchr(pc, '@');
if (p && ((size_t)(p - pc) < exp.nNameLength)) if (p && (p - pc < exp.nNameLength))
{ {
int i; int i;
exp.nNameLength = p - pc; exp.nNameLength = (int)(p - pc);
if (exp.nNameLength < 1) if (exp.nNameLength < 1)
{ {
fprintf(stderr, "error, @ in line %d\n", nLine); fprintf(stderr, "error, @ in line %d\n", nLine);
@ -669,7 +669,8 @@ ParseFile(char* pcStart, FILE *fileDest, PFNOUTLINE OutputLine)
} }
/* Get optional redirection */ /* Get optional redirection */
if ((pc = NextToken(pc))) pc = NextToken(pc);
if (pc)
{ {
exp.pcRedirection = pc; exp.pcRedirection = pc;
exp.nRedirectionLength = TokenLength(pc); exp.nRedirectionLength = TokenLength(pc);