empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(info) [_WIN32]: Add brackets to ensure the right combination of

Browse source 
ORs and ANDs.

(apro) [_WIN32]: Remove space to fix formatting for logerror().
Fix printing type for lhitlim in the format string for logerror() call.
This commit is contained in:
Ron Koenderink 2006-01-01 19:55:53 +00:00
parent f1d9a5eba3
commit ce4190caf7
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/commands/info.c
View file

@ -377,9 +377,9 @@ info(void)
else { else {
DWORD fAttrib = GetFileAttributes(filename); DWORD fAttrib = GetFileAttributes(filename);
if ((fAttrib == (DWORD)-1) || /* INVALID_FILE_ATTRIBUTES */ if ((fAttrib == (DWORD)-1) || /* INVALID_FILE_ATTRIBUTES */
(fAttrib != FILE_ATTRIBUTE_NORMAL) && ((fAttrib != FILE_ATTRIBUTE_NORMAL) &&
(fAttrib != FILE_ATTRIBUTE_ARCHIVE) && (fAttrib != FILE_ATTRIBUTE_ARCHIVE) &&
(fAttrib != FILE_ATTRIBUTE_READONLY)) { (fAttrib != FILE_ATTRIBUTE_READONLY))) {
pr("Error reading info file for %s\n", name); pr("Error reading info file for %s\n", name);
logerror("The info file \"%s\" is not regular file\n", logerror("The info file \"%s\" is not regular file\n",
filename); filename);
@ -430,7 +430,7 @@ apro(void)
} else { } else {
pr("Error reading info dir\n"); pr("Error reading info dir\n");
logerror("Error (%lu) reading info dir(%s)\\file(%s)", logerror("Error (%lu) reading info dir(%s)\\file(%s)",
GetLastError(), infodir, filename); GetLastError(), infodir, filename);
} }
return RET_SYS; return RET_SYS;
} }
@ -496,7 +496,7 @@ apro(void)
free(lbp); free(lbp);
if ((nhl) > lhitlim) { if ((nhl) > lhitlim) {
pr("Limit of %ld lines exceeded\n", lhitlim); pr("Limit of %d lines exceeded\n", lhitlim);
} }
pr("Found %s in %ld of %ld files and in %ld of %ld lines\n", pr("Found %s in %ld of %ld files and in %ld of %ld lines\n",
name, nhf, nf, nhl, nl); name, nhf, nf, nhl, nl);