d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

catgets: detect if fd becomes invalid after exec and return default response

Browse Source 
cosmetique, use NULL for pointers comparison
This commit is contained in:
Andrey A. Chernov 2000-08-30 11:44:44 +00:00
parent 5e52038c0e
commit b9b68e50dc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libc/nls/msgcat.c
View File

@ -194,7 +194,7 @@ int setId;
MCSetT *set;
long lo, hi, cur, dir;
if (!cat || setId <= 0) return(NULL);
if (cat == NULL || setId <= 0) return(NULL);
lo = 0;
if (setId - 1 < cat->numSets) {
@ -220,8 +220,8 @@ int setId;
if (hi - lo == 1) cur += dir;
else cur += ((hi - lo) / 2) * dir;
}
if (set->invalid)
(void) loadSet(cat, set);
if (set->invalid && loadSet(cat, set) <= 0)
return(NULL);
return(set);
}
@ -233,7 +233,7 @@ int msgId;
MCMsgT *msg;
long lo, hi, cur, dir;
if (!set || set->invalid || msgId <= 0) return(NULL);
if (set == NULL || set->invalid || msgId <= 0) return(NULL);
lo = 0;
if (msgId - 1 < set->numMsgs) {
@ -326,7 +326,7 @@ __const char *catpath;
off_t nextSet;
cat = (MCCatT *) malloc(sizeof(MCCatT));
if (!cat) return(NLERR);
if (cat == NULL) return(NLERR);
cat->loadType = MCLoadBySet;
if ((cat->fd = _open(catpath, O_RDONLY)) < 0) {
@ -359,7 +359,7 @@ __const char *catpath;
cat->numSets = header.numSets;
cat->sets = (MCSetT *) malloc(sizeof(MCSetT) * header.numSets);
if (!cat->sets) NOSPACE();
if (cat->sets == NULL) NOSPACE();
nextSet = header.firstSet;
for (i = 0; i < cat->numSets; ++i) {