Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/pkg_install/lib Fix a typo.
details: https://anonhg.NetBSD.org/src/rev/f942722cc0dd
branches: trunk
changeset: 481441:f942722cc0dd
user: agc <agc%NetBSD.org@localhost>
date: Mon Jan 31 13:39:08 2000 +0000
description:
Fix a typo.
Make a start at linting this.
diffstat:
usr.sbin/pkg_install/lib/ftpio.c | 58 ++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diffs (197 lines):
diff -r e38cb9980797 -r f942722cc0dd usr.sbin/pkg_install/lib/ftpio.c
--- a/usr.sbin/pkg_install/lib/ftpio.c Mon Jan 31 13:33:19 2000 +0000
+++ b/usr.sbin/pkg_install/lib/ftpio.c Mon Jan 31 13:39:08 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpio.c,v 1.10 2000/01/31 13:33:19 agc Exp $ */
+/* $NetBSD: ftpio.c,v 1.11 2000/01/31 13:39:08 agc Exp $ */
/* Id: foo2.c,v 1.12 1999/12/17 02:31:57 feyrer Exp feyrer */
/*
@@ -222,13 +222,13 @@
case 0:
/* Child */
- close(command_pipe[1]);
+ (void) close(command_pipe[1]);
dup2(command_pipe[0], 0);
- close(command_pipe[0]);
+ (void) close(command_pipe[0]);
- close(answer_pipe[0]);
+ (void) close(answer_pipe[0]);
dup2(answer_pipe[1], 1);
- close(answer_pipe[1]);
+ (void) close(answer_pipe[1]);
setbuf(stdout, NULL);
@@ -240,12 +240,12 @@
break;
default:
/* Parent */
- close(command_pipe[0]);
- close(answer_pipe[1]);
+ (void) close(command_pipe[0]);
+ (void) close(answer_pipe[1]);
- snprintf(buf, sizeof(buf), "%d", command_pipe[1]);
+ (void) snprintf(buf, sizeof(buf), "%d", command_pipe[1]);
setenv(PKG_FTPIO_COMMAND, buf, 1);
- snprintf(buf, sizeof(buf), "%d", answer_pipe[0]);
+ (void) snprintf(buf, sizeof(buf), "%d", answer_pipe[0]);
setenv(PKG_FTPIO_ANSWER, buf, 1);
ftpio.command = command_pipe[1];
@@ -296,8 +296,8 @@
if (needclose)
ftp_cmd("close\n", "\n(221 Goodbye.|Not connected.)\n");
- close(ftpio.command);
- close(ftpio.answer);
+ (void) close(ftpio.command);
+ (void) close(ftpio.answer);
}
#if !(defined(__svr4__) && defined(__sun__))
@@ -329,7 +329,7 @@
&& ( strcmp(newHost, currentHost) != 0
|| strcmp(newDir, currentDir) != 0)) { /* could handle new dir case better here, w/o reconnect */
if (Verbose) {
- printf("ftp_stgart: new host or dir, stopping previous connect...\n");
+ printf("ftp_start: new host or dir, stopping previous connect...\n");
printf("currentHost='%s', newHost='%s'\n", currentHost, newHost);
printf("currentDir='%s', newDir='%s'\n", currentDir, newDir);
}
@@ -406,7 +406,7 @@
warnx("expandURL: no '/' in url %s?!", wildcardurl);
return -1;
}
- snprintf(base, FILENAME_MAX, "%*.*s/", (int)(pkg-wildcardurl),
+ (void) snprintf(base, sizeof(base), "%*.*s/", (int)(pkg-wildcardurl),
(int)(pkg-wildcardurl), wildcardurl);
pkg++;
@@ -432,13 +432,13 @@
/* This should only happen when getting here with (only) a package
* name specified to pkg_add, and PKG_PATH containing some URL.
*/
- snprintf(buf,FILENAME_MAX, "ls %s %s\n", pkg, tmpname);
+ (void) snprintf(buf, sizeof(buf), "ls %s %s\n", pkg, tmpname);
} else {
/* replace possible version(wildcard) given with "-*".
* we can't use the pkg wildcards here as dewey compare
* and alternates won't be handled by ftp(1); sort
* out later, using pmatch() */
- snprintf(buf, FILENAME_MAX, "ls %*.*s*.tgz %s\n",
+ (void) snprintf(buf, sizeof(buf), "ls %*.*s*.tgz %s\n",
(int)(s-pkg), (int)(s-pkg), pkg, tmpname);
}
@@ -470,7 +470,7 @@
matches=0;
/* The following loop is basically the same as the readdir() loop
* in findmatchingname() */
- while (fgets(filename, FILENAME_MAX, f)) {
+ while (fgets(filename, sizeof(buf), f)) {
filename[strlen(filename)-1] = '\0';
if (pmatch(pkg, filename)) {
matches++;
@@ -479,7 +479,7 @@
findbestmatchingname_fn(filename, best);
}
}
- fclose(f);
+ (void) fclose(f);
if (matches == 0)
warnx("nothing appropriate found\n");
@@ -532,9 +532,9 @@
warnx("unpackURL: no '/' in url %s?!", url);
return -1;
}
- snprintf(base, FILENAME_MAX, "%*.*s/", (int)(pkg-url),
+ (void) snprintf(base, sizeof(base), "%*.*s/", (int)(pkg-url),
(int)(pkg-url), url);
- snprintf(pkg_path, FILENAME_MAX, "%*.*s", (int)(pkg-url),
+ (void) snprintf(pkg_path, sizeof(pkg_path), "%*.*s", (int)(pkg-url),
(int)(pkg-url), url); /* no trailing '/' */
pkg++;
@@ -557,7 +557,7 @@
printf("unpackURL '%s' to '%s'\n", url, dir);
/* yes, this is gross, but needed for borken ftp(1) */
- snprintf(cmd, sizeof(cmd), "get %s \"| ( cd %s ; gunzip 2>/dev/null | tar -%sx -f - )\"\n", pkg, dir, Verbose?"vv":"");
+ (void) snprintf(cmd, sizeof(cmd), "get %s \"| ( cd %s ; gunzip 2>/dev/null | tar -%sx -f - )\"\n", pkg, dir, Verbose?"vv":"");
rc = ftp_cmd(cmd, "\n(226|550).*\n");
if (rc != 226) {
warnx("Cannot fetch file (%d!=226)!", rc);
@@ -585,7 +585,7 @@
warnx("miscstuff: no '/' in url %s?!", url);
return -1;
}
- snprintf(base, FILENAME_MAX, "%*.*s/", (int)(pkg-url), (int)(pkg-url),
+ (void) snprintf(base, sizeof(base), "%*.*s/", (int)(pkg-url), (int)(pkg-url),
url);
pkg++;
@@ -609,13 +609,13 @@
char cmd[256];
char tmpdir[256];
- snprintf(tmpdir, sizeof(tmpdir), "/tmp/dir%s",
+ (void) snprintf(tmpdir, sizeof(tmpdir), "/tmp/dir%s",
(getenv(PKG_FTPIO_CNT))?getenv(PKG_FTPIO_CNT):"");
mkdir(tmpdir, 0755);
/* yes, this is gross, but needed for borken ftp(1) */
- snprintf(cmd, sizeof(cmd), "get xpmroot-1.01.tgz \"| ( cd %s ; gunzip 2>/dev/null | tar -vvx -f - )\"\n", tmpdir);
+ (void) snprintf(cmd, sizeof(cmd), "get xpmroot-1.01.tgz \"| ( cd %s ; gunzip 2>/dev/null | tar -vvx -f - )\"\n", tmpdir);
rc = ftp_cmd(cmd, "\n(226|550).*\n");
if (rc != 226) {
warnx("Cannot fetch file (%d != 226)!", rc);
@@ -626,7 +626,7 @@
/* check if one more file(s) exist */
if (0) {
char buf[FILENAME_MAX];
- snprintf(buf,FILENAME_MAX, "ls %s /tmp/xxx\n", pkg);
+ (void) snprintf(buf, sizeof(buf), "ls %s /tmp/xxx\n", pkg);
rc = ftp_cmd(buf, "\n(226|550).*\n"); /* catch errors */
if (rc != 226) {
if (Verbose)
@@ -657,7 +657,7 @@
count=0;
while (fgetln(f, &len))
count++;
- fclose(f);
+ (void) fclose(f);
printf("#lines = %d\n", count);
}
@@ -675,10 +675,10 @@
char *s, buf[FILENAME_MAX];
if ((s=getenv(PKG_FTPIO_CNT)) && atoi(s)>0){
- snprintf(buf,FILENAME_MAX,"%d", atoi(s)-1);
+ (void) snprintf(buf, sizeof(buf),"%d", atoi(s)-1);
setenv(PKG_FTPIO_CNT, buf, 1);
- snprintf(buf, FILENAME_MAX, "%s \"%s/%s\"", argv0, url, pkg);
+ (void) snprintf(buf, sizeof(buf), "%s \"%s/%s\"", argv0, url, pkg);
printf("%s>>> %s\n", s, buf);
system(buf);
}
@@ -735,10 +735,10 @@
char *s, buf[FILENAME_MAX];
if ((s=getenv(PKG_FTPIO_CNT)) && atoi(s)>0){
- snprintf(buf,FILENAME_MAX,"%d", atoi(s)-1);
+ (void) snprintf(buf, sizeof(buf),"%d", atoi(s)-1);
setenv(PKG_FTPIO_CNT, buf, 1);
- snprintf(buf, FILENAME_MAX, "%s -v '%s'", argv0, argv[0]);
+ (void) snprintf(buf, sizeof(buf), "%s -v '%s'", argv0, argv[0]);
printf("%s>>> %s\n", s, buf);
system(buf);
}
Home |
Main Index |
Thread Index |
Old Index