Module Name: src
Committed By: joerg
Date: Tue Jan 7 02:13:00 UTC 2014
Modified Files:
src/external/bsd/fetch/dist/libfetch: common.h ftp.c http.c
Log Message:
Annotate format strings. Add a bunch of int casts for size limits.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/fetch/dist/libfetch/common.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/fetch/dist/libfetch/ftp.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/fetch/dist/libfetch/http.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/dist/libfetch/common.h
diff -u src/external/bsd/fetch/dist/libfetch/common.h:1.1.1.7 src/external/bsd/fetch/dist/libfetch/common.h:1.2
--- src/external/bsd/fetch/dist/libfetch/common.h:1.1.1.7 Wed Mar 24 20:51:42 2010
+++ src/external/bsd/fetch/dist/libfetch/common.h Tue Jan 7 02:13:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.1.1.7 2010/03/24 20:51:42 joerg Exp $ */
+/* $NetBSD: common.h,v 1.2 2014/01/07 02:13:00 joerg Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* All rights reserved.
@@ -90,7 +90,7 @@ struct fetcherr {
void fetch_seterr(struct fetcherr *, int);
void fetch_syserr(void);
-void fetch_info(const char *, ...);
+void fetch_info(const char *, ...) __printflike(1, 2);
int fetch_default_port(const char *);
int fetch_default_proxy_port(const char *);
int fetch_bind(int, int, const char *);
Index: src/external/bsd/fetch/dist/libfetch/ftp.c
diff -u src/external/bsd/fetch/dist/libfetch/ftp.c:1.6 src/external/bsd/fetch/dist/libfetch/ftp.c:1.7
--- src/external/bsd/fetch/dist/libfetch/ftp.c:1.6 Sat Oct 19 22:58:40 2013
+++ src/external/bsd/fetch/dist/libfetch/ftp.c Tue Jan 7 02:13:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.6 2013/10/19 22:58:40 mrg Exp $ */
+/* $NetBSD: ftp.c,v 1.7 2014/01/07 02:13:00 joerg Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2009, 2010 Joerg Sonnenberger <jo...@netbsd.org>
@@ -198,6 +198,7 @@ ftp_chkerr(conn_t *conn)
/*
* Send a command and check reply
*/
+__printflike(2, 3)
static int
ftp_cmd(conn_t *conn, const char *fmt, ...)
{
@@ -391,7 +392,7 @@ ftp_cwd(conn_t *conn, const char *path,
++beg, ++i;
for (++i; dst + i < end && dst[i] != '/'; ++i)
/* nothing */ ;
- e = ftp_cmd(conn, "CWD %.*s\r\n", dst + i - beg, beg);
+ e = ftp_cmd(conn, "CWD %.*s\r\n", (int)(dst + i - beg), beg);
if (e != FTP_FILE_ACTION_OK) {
free(dst);
ftp_seterr(e);
@@ -489,7 +490,7 @@ ftp_stat(conn_t *conn, const char *file,
return (-1);
}
- e = ftp_cmd(conn, "SIZE %.*s\r\n", filenamelen, filename);
+ e = ftp_cmd(conn, "SIZE %.*s\r\n", (int)filenamelen, filename);
if (e != FTP_FILE_STATUS) {
ftp_seterr(e);
return (-1);
@@ -506,7 +507,7 @@ ftp_stat(conn_t *conn, const char *file,
if (us->size == 0)
us->size = -1;
- e = ftp_cmd(conn, "MDTM %.*s\r\n", filenamelen, filename);
+ e = ftp_cmd(conn, "MDTM %.*s\r\n", (int)filenamelen, filename);
if (e != FTP_FILE_STATUS) {
ftp_seterr(e);
return (-1);
@@ -851,7 +852,7 @@ retry_mode:
e = ftp_cmd(conn, "%s%s%s\r\n", oper, *op_arg ? " " : "", op_arg);
else
e = ftp_cmd(conn, "%s %.*s\r\n", oper,
- filenamelen, filename);
+ (int)filenamelen, filename);
if (e != FTP_CONNECTION_ALREADY_OPEN && e != FTP_OPEN_DATA_CONNECTION)
goto ouch;
@@ -948,7 +949,7 @@ retry_mode:
e = ftp_cmd(conn, "%s%s%s\r\n", oper, *op_arg ? " " : "", op_arg);
else
e = ftp_cmd(conn, "%s %.*s\r\n", oper,
- filenamelen, filename);
+ (int)filenamelen, filename);
if (e != FTP_CONNECTION_ALREADY_OPEN && e != FTP_OPEN_DATA_CONNECTION)
goto ouch;
Index: src/external/bsd/fetch/dist/libfetch/http.c
diff -u src/external/bsd/fetch/dist/libfetch/http.c:1.2 src/external/bsd/fetch/dist/libfetch/http.c:1.3
--- src/external/bsd/fetch/dist/libfetch/http.c:1.2 Sat Jun 25 20:27:01 2011
+++ src/external/bsd/fetch/dist/libfetch/http.c Tue Jan 7 02:13:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: http.c,v 1.2 2011/06/25 20:27:01 christos Exp $ */
+/* $NetBSD: http.c,v 1.3 2014/01/07 02:13:00 joerg Exp $ */
/*-
* Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2003 Thomas Klausner <w...@netbsd.org>
@@ -404,6 +404,7 @@ static struct {
/*
* Send a formatted line; optionally echo to terminal
*/
+__printflike(2, 3)
static int
http_cmd(conn_t *conn, const char *fmt, ...)
{
