diff options
| author | Michael Brown | 2007-06-08 17:33:24 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-06-08 17:33:24 +0200 |
| commit | 6f0a6c09db3b714849e3f84dabd3ad9ee9041607 (patch) | |
| tree | 67b0a5d66d2ea9a0508c36ca0a4eaaffa3045725 /src/net/tcp | |
| parent | Should call ftp_done() if constructor fails. (diff) | |
| parent | Conflicts with native asn1.c (diff) | |
| download | ipxe-6f0a6c09db3b714849e3f84dabd3ad9ee9041607.tar.gz ipxe-6f0a6c09db3b714849e3f84dabd3ad9ee9041607.tar.xz ipxe-6f0a6c09db3b714849e3f84dabd3ad9ee9041607.zip | |
Merge branch 'master' into mcb-tcp-xfer
Diffstat (limited to 'src/net/tcp')
| -rw-r--r-- | src/net/tcp/iscsi.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c index 56567976..f95286d0 100644 --- a/src/net/tcp/iscsi.c +++ b/src/net/tcp/iscsi.c @@ -23,6 +23,7 @@ #include <errno.h> #include <assert.h> #include <byteswap.h> +#include <gpxe/vsprintf.h> #include <gpxe/scsi.h> #include <gpxe/process.h> #include <gpxe/uaccess.h> @@ -349,32 +350,6 @@ static void iscsi_tx_data_out ( struct iscsi_session *iscsi, */ /** - * Version of snprintf() that accepts a signed buffer size - * - * @v buf Buffer into which to write the string - * @v size Size of buffer - * @v fmt Format string - * @v args Arguments corresponding to the format string - * @ret len Length of formatted string - * - * This is a utility function for iscsi_build_login_request_strings(). - */ -static int ssnprintf ( char *buf, ssize_t ssize, const char *fmt, ... ) { - va_list args; - int len; - - /* Treat negative buffer size as zero buffer size */ - if ( ssize < 0 ) - ssize = 0; - - /* Hand off to vsnprintf */ - va_start ( args, fmt ); - len = vsnprintf ( buf, ssize, fmt, args ); - va_end ( args ); - return len; -} - -/** * Build iSCSI login request strings * * @v iscsi iSCSI session |