Page MenuHomeFreeBSD
Files F166854424

D55610.id173033.diff
No OneTemporary
Actions

D55610.id173033.diff
View Options

Index: bin/df/df.c
===================================================================
--- bin/df/df.c
+++ bin/df/df.c
@@ -196,7 +196,7 @@
/* just the filesystems specified on the command line */
mntbuf = malloc(argc * sizeof(*mntbuf));
if (mntbuf == NULL)
- xo_err(1, "malloc()");
+ xo_err(EXIT_FAILURE, "malloc()");
mntsize = 0;
/* continued in for loop below */
}
@@ -305,10 +305,8 @@
for (i = 0, nextcp = fslist; *nextcp != '\0'; nextcp++)
if (*nextcp == ',')
i++;
- if ((av = malloc((i + 2) * sizeof(char *))) == NULL) {
- xo_warnx("malloc failed");
- return (NULL);
- }
+ if ((av = malloc((i + 2) * sizeof(char *))) == NULL)
+ xo_errx(EXIT_FAILURE, "malloc failed");
nextcp = fslist;
i = 0;
av[i++] = nextcp;
@@ -636,50 +634,47 @@
int cnt, i, maxvfsconf;
if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) {
- xo_warn("sysctl(vfs.conflist)");
- return (NULL);
+ xo_err(EXIT_FAILURE, "sysctl(vfs.conflist)");
}
xvfsp = malloc(buflen);
- if (xvfsp == NULL) {
- xo_warnx("malloc failed");
- return (NULL);
- }
+ if (xvfsp == NULL)
+ xo_errx(EXIT_FAILURE, "malloc failed");
keep_xvfsp = xvfsp;
if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) {
- xo_warn("sysctl(vfs.conflist)");
free(keep_xvfsp);
- return (NULL);
+ xo_err(EXIT_FAILURE, "sysctl(vfs.conflist)");
}
maxvfsconf = buflen / sizeof(struct xvfsconf);
if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) {
- xo_warnx("malloc failed");
free(keep_xvfsp);
- return (NULL);
+ xo_errx(EXIT_FAILURE, "malloc failed");
}
for (cnt = 0, i = 0; i < maxvfsconf; i++) {
if (xvfsp->vfc_flags & VFCF_NETWORK) {
listptr[cnt++] = strdup(xvfsp->vfc_name);
if (listptr[cnt-1] == NULL) {
- xo_warnx("malloc failed");
free(listptr);
free(keep_xvfsp);
- return (NULL);
+ xo_errx(EXIT_FAILURE, "malloc failed");
}
}
xvfsp++;
}
- if (cnt == 0 ||
- (str = malloc(sizeof(char) * (32 * cnt + cnt + 2))) == NULL) {
- if (cnt > 0)
- xo_warnx("malloc failed");
+ if (cnt == 0) {
free(listptr);
free(keep_xvfsp);
return (NULL);
}
+ if ((str = malloc(32 * cnt + cnt + 2)) == NULL) {
+ free(listptr);
+ free(keep_xvfsp);
+ xo_errx(EXIT_FAILURE, "malloc failed");
+ }
+
*str = 'n'; *(str + 1) = 'o';
for (i = 0, strptr = str + 2; i < cnt; i++, strptr++) {
strlcpy(strptr, listptr[i], 32);

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 18, 3:52 AM (10 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36884145
Default Alt Text
D55610.id173033.diff (2 KB)

Event Timeline