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

1) Make usage() as dead2 - it helps the compiler know that some vars

Browse Source 
are not used uninitialised.
2) Fix some constness problems.
3) Avoid a signedness problem by casting to size_t. If bn != stuff,
than stuff-1-bn should be > 0.
This commit is contained in:
David Malone 2010-01-05 20:53:55 +00:00
parent af827f9642
commit c4e3e4f1b5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=201610
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.bin/xlint/xlint/xlint.c
View File

@ -135,7 +135,7 @@ static char *concat3(const char *, const char *, const char *);
static void terminate(int) __attribute__((__noreturn__));
static const char *lbasename(const char *, int);
static void appdef(char ***, const char *);
static void usage(void);
static void usage(void) __dead2;
static void fname(const char *);
static void runchild(const char *, char *const *, const char *, int);
static void findlibs(char *const *);
@ -304,11 +304,12 @@ int
main(int argc, char *argv[])
{
int c;
char flgbuf[3], *tmp, *s;
char flgbuf[3], *s;
const char *tmp;
size_t len;
if ((tmp = getenv("TMPDIR")) == NULL || (len = strlen(tmp)) == 0) {
tmpdir = xstrdup(_PATH_TMP);
tmpdir = _PATH_TMP;
} else {
s = xmalloc(len + 2);
(void)sprintf(s, "%s%s", tmp, tmp[len - 1] == '/' ? "" : "/");
@ -555,9 +556,9 @@ main(int argc, char *argv[])
terminate(0);
if (!oflag) {
if ((s = getenv("LIBDIR")) == NULL || strlen(s) == 0)
s = PATH_LINTLIB;
appcstrg(&libsrchpath, s);
if ((tmp = getenv("LIBDIR")) == NULL || strlen(tmp) == 0)
tmp = PATH_LINTLIB;
appcstrg(&libsrchpath, tmp);
findlibs(libs);
findlibs(deflibs);
}
@ -620,7 +621,7 @@ fname(const char *name)
return;
}
ofn = xmalloc(strlen(bn) + (bn == suff ? 4 : 2));
len = bn == suff ? strlen(bn) : (suff - 1) - bn;
len = bn == suff ? strlen(bn) : (size_t)((suff - 1) - bn);
(void)sprintf(ofn, "%.*s", (int)len, bn);
(void)strcat(ofn, ".ln");
} else {