Use pcap_snprintf() instead of snprintf().

[libpcap] / savefile.c

diff --git a/savefile.c b/savefile.c
index 1032b43e8a99754c6fe11b10abc3131025ba745f..b8d1d305805436a17af8353c00b078cd3716f0e4 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -96,7 +96,7 @@ sf_setnonblock(pcap_t *p, int nonblock, char *errbuf)
         * as it would have to handle reading partial packets and
         * keeping the state of the read.)
         */
-       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "Savefiles cannot be put into non-blocking mode");
        return (-1);
 }
@@ -104,7 +104,7 @@ sf_setnonblock(pcap_t *p, int nonblock, char *errbuf)
 static int
 sf_stats(pcap_t *p, struct pcap_stat *ps)
 {
-       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "Statistics aren't available from savefiles");
        return (-1);
 }
@@ -113,7 +113,7 @@ sf_stats(pcap_t *p, struct pcap_stat *ps)
 static struct pcap_stat *
 sf_stats_ex(pcap_t *p, int *size)
 {
-       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "Statistics aren't available from savefiles");
        return (NULL);
 }
@@ -121,7 +121,7 @@ sf_stats_ex(pcap_t *p, int *size)
 static int
 sf_setbuff(pcap_t *p, int dim)
 {
-       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "The kernel buffer size cannot be set while reading from a file");
        return (-1);
 }
@@ -129,7 +129,7 @@ sf_setbuff(pcap_t *p, int dim)
 static int
 sf_setmode(pcap_t *p, int mode)
 {
-       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "impossible to set mode while reading from a file");
        return (-1);
 }
@@ -137,7 +137,7 @@ sf_setmode(pcap_t *p, int mode)
 static int
 sf_setmintocopy(pcap_t *p, int size)
 {
-       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "The mintocopy parameter cannot be set while reading from a file");
        return (-1);
 }
@@ -145,7 +145,7 @@ sf_setmintocopy(pcap_t *p, int size)
 static HANDLE
 sf_getevent(pcap_t *pcap)
 {
-       (void)snprintf(pcap->errbuf, sizeof(pcap->errbuf),
+       (void)pcap_snprintf(pcap->errbuf, sizeof(pcap->errbuf),
            "The read event cannot be retrieved while reading from a file");
        return (INVALID_HANDLE_VALUE);
 }
@@ -154,7 +154,7 @@ static int
 sf_oid_get_request(pcap_t *p, bpf_u_int32 oid _U_, void *data _U_,
     size_t len _U_)
 {
-       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "An OID get request cannot be performed on a file");
        return (PCAP_ERROR);
 }
@@ -163,7 +163,7 @@ static int
 sf_oid_set_request(pcap_t *p, bpf_u_int32 oid _U_, const void *data _U_,
     size_t len _U_)
 {
-       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "An OID set request cannot be performed on a file");
        return (PCAP_ERROR);
 }
@@ -179,7 +179,7 @@ sf_sendqueue_transmit(pcap_t *p, pcap_send_queue *queue, int sync)
 static int
 sf_setuserbuffer(pcap_t *p, int size)
 {
-       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "The user buffer cannot be set when reading from a file");
        return (-1);
 }
@@ -187,7 +187,7 @@ sf_setuserbuffer(pcap_t *p, int size)
 static int
 sf_live_dump(pcap_t *p, char *filename, int maxsize, int maxpacks)
 {
-       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "Live packet dumping cannot be performed when reading from a file");
        return (-1);
 }
@@ -195,7 +195,7 @@ sf_live_dump(pcap_t *p, char *filename, int maxsize, int maxpacks)
 static int
 sf_live_dump_ended(pcap_t *p, int sync)
 {
-       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "Live packet dumping cannot be performed on a pcap_open_dead pcap_t");
        return (-1);
 }
@@ -222,7 +222,7 @@ sf_inject(pcap_t *p, const void *buf _U_, size_t size _U_)
 static int
 sf_setdirection(pcap_t *p, pcap_direction_t d)
 {
-       snprintf(p->errbuf, sizeof(p->errbuf),
+       pcap_snprintf(p->errbuf, sizeof(p->errbuf),
            "Setting direction is not supported on savefiles");
        return (-1);
 }
@@ -262,7 +262,7 @@ pcap_open_offline_with_tstamp_precision(const char *fname, u_int precision,
                fp = fopen(fname, "rb");
 #endif
                if (fp == NULL) {
-                       snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", fname,
+                       pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", fname,
                            pcap_strerror(errno));
                        return (NULL);
                }
@@ -292,14 +292,14 @@ pcap_t* pcap_hopen_offline_with_tstamp_precision(intptr_t osfd, u_int precision,
        fd = _open_osfhandle(osfd, _O_RDONLY);
        if ( fd < 0 )
        {
-               snprintf(errbuf, PCAP_ERRBUF_SIZE, pcap_strerror(errno));
+               pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, pcap_strerror(errno));
                return NULL;
        }
 
        file = _fdopen(fd, "rb");
        if ( file == NULL )
        {
-               snprintf(errbuf, PCAP_ERRBUF_SIZE, pcap_strerror(errno));
+               pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, pcap_strerror(errno));
                return NULL;
        }
 
@@ -344,11 +344,11 @@ pcap_fopen_offline_with_tstamp_precision(FILE *fp, u_int precision,
        amt_read = fread((char *)&magic, 1, sizeof(magic), fp);
        if (amt_read != sizeof(magic)) {
                if (ferror(fp)) {
-                       snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                       pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "error reading dump file: %s",
                            pcap_strerror(errno));
                } else {
-                       snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                       pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
                            "truncated dump file; tried to read %lu file header bytes, only got %lu",
                            (unsigned long)sizeof(magic),
                            (unsigned long)amt_read);
@@ -376,7 +376,7 @@ pcap_fopen_offline_with_tstamp_precision(FILE *fp, u_int precision,
        /*
         * Well, who knows what this mess is....
         */
-       snprintf(errbuf, PCAP_ERRBUF_SIZE, "unknown file format");
+       pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "unknown file format");
        return (NULL);
 
 found: