From ce4190caf7fc364272bb060cc59ef4f22b8357be Mon Sep 17 00:00:00 2001 From: Ron Koenderink Date: Sun, 1 Jan 2006 19:55:53 +0000 Subject: [PATCH] (info) [_WIN32]: Add brackets to ensure the right combination of ORs and ANDs. (apro) [_WIN32]: Remove space to fix formatting for logerror(). Fix printing type for lhitlim in the format string for logerror() call. --- src/lib/commands/info.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/commands/info.c b/src/lib/commands/info.c index 19a05625..bc023c54 100644 --- a/src/lib/commands/info.c +++ b/src/lib/commands/info.c @@ -377,9 +377,9 @@ info(void) else { DWORD fAttrib = GetFileAttributes(filename); if ((fAttrib == (DWORD)-1) || /* INVALID_FILE_ATTRIBUTES */ - (fAttrib != FILE_ATTRIBUTE_NORMAL) && - (fAttrib != FILE_ATTRIBUTE_ARCHIVE) && - (fAttrib != FILE_ATTRIBUTE_READONLY)) { + ((fAttrib != FILE_ATTRIBUTE_NORMAL) && + (fAttrib != FILE_ATTRIBUTE_ARCHIVE) && + (fAttrib != FILE_ATTRIBUTE_READONLY))) { pr("Error reading info file for %s\n", name); logerror("The info file \"%s\" is not regular file\n", filename); @@ -430,7 +430,7 @@ apro(void) } else { pr("Error reading info dir\n"); logerror("Error (%lu) reading info dir(%s)\\file(%s)", - GetLastError(), infodir, filename); + GetLastError(), infodir, filename); } return RET_SYS; } @@ -496,7 +496,7 @@ apro(void) free(lbp); 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", name, nhf, nf, nhl, nl);