Prefix routines declared in pcap-int.h with pcap_.

[libpcap] / pcap-int.h

diff --git a/pcap-int.h b/pcap-int.h
index 22537173cfe78768c135db2b9ba4fb462b00f69e..df4ab74f6bd393b358fcd3da3e29822f98a9a358 100644 (file)
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -520,12 +520,12 @@ void      pcap_breakloop_common(pcap_t *);
  * "pcap_findalldevs_interfaces()" is a helper to find those interfaces
  * using the "standard" mechanisms (SIOCGIFCONF, "getifaddrs()", etc.).
  *
- * "add_dev()" adds an entry to a pcap_if_list_t.
+ * "pcap_add_dev()" adds an entry to a pcap_if_list_t.
  *
- * "find_dev()" tries to find a device, by name, in a pcap_if_list_t.
+ * "pcap_find_dev()" tries to find a device, by name, in a pcap_if_list_t.
  *
- * "find_or_add_dev()" checks whether a device is already in a pcap_if_list_t
- * and, if not, adds an entry for it.
+ * "pcap_find_or_add_dev()" checks whether a device is already in a
+ * pcap_if_list_t and, if not, adds an entry for it.
  */
 struct pcap_if_list;
 typedef struct pcap_if_list pcap_if_list_t;
@@ -535,18 +535,18 @@ int       pcap_platform_finddevs(pcap_if_list_t *, char *);
 int    pcap_findalldevs_interfaces(pcap_if_list_t *, char *,
            int (*)(const char *), get_if_flags_func);
 #endif
-pcap_if_t *find_or_add_dev(pcap_if_list_t *, const char *, bpf_u_int32,
+pcap_if_t *pcap_find_or_add_dev(pcap_if_list_t *, const char *, bpf_u_int32,
            get_if_flags_func, const char *, char *);
-pcap_if_t *find_dev(pcap_if_list_t *, const char *);
-pcap_if_t *add_dev(pcap_if_list_t *, const char *, bpf_u_int32, const char *,
-           char *);
-int    add_addr_to_dev(pcap_if_t *, struct sockaddr *, size_t,
+pcap_if_t *pcap_find_dev(pcap_if_list_t *, const char *);
+pcap_if_t *pcap_add_dev(pcap_if_list_t *, const char *, bpf_u_int32,
+           const char *, char *);
+int    pcap_add_addr_to_dev(pcap_if_t *, struct sockaddr *, size_t,
            struct sockaddr *, size_t, struct sockaddr *, size_t,
            struct sockaddr *dstaddr, size_t, char *errbuf);
 #ifndef _WIN32
-pcap_if_t *find_or_add_if(pcap_if_list_t *, const char *, bpf_u_int32,
+pcap_if_t *pcap_find_or_add_if(pcap_if_list_t *, const char *, bpf_u_int32,
            get_if_flags_func, char *);
-int    add_addr_to_if(pcap_if_list_t *, const char *, bpf_u_int32,
+int    pcap_add_addr_to_if(pcap_if_list_t *, const char *, bpf_u_int32,
            get_if_flags_func,
            struct sockaddr *, size_t, struct sockaddr *, size_t,
            struct sockaddr *, size_t, struct sockaddr *, size_t, char *);
@@ -562,11 +562,11 @@ int       add_addr_to_if(pcap_if_list_t *, const char *, bpf_u_int32,
  * "pcap_adjust_snapshot()" adjusts the snapshot to be non-zero and
  * fit within an int.
  *
- * "sf_cleanup()" closes the file handle associated with a pcap_t, if
+ * "pcap_sf_cleanup()" closes the file handle associated with a pcap_t, if
  * appropriate, and frees all data common to all modules for handling
  * savefile types.
  *
- * "charset_fopen()", in UTF-8 mode on Windows, does an fopen() that
+ * "pcap_charset_fopen()", in UTF-8 mode on Windows, does an fopen() that
  * treats the pathname as being in UTF-8, rather than the local
  * code page, on Windows.
  */
@@ -585,14 +585,14 @@ int       add_addr_to_if(pcap_if_list_t *, const char *, bpf_u_int32,
 pcap_t *pcap_open_offline_common(char *ebuf, size_t total_size,
     size_t private_data);
 bpf_u_int32 pcap_adjust_snapshot(bpf_u_int32 linktype, bpf_u_int32 snaplen);
-void   sf_cleanup(pcap_t *p);
+void   pcap_sf_cleanup(pcap_t *p);
 #ifdef _WIN32
-FILE   *charset_fopen(const char *path, const char *mode);
+FILE   *pcap_charset_fopen(const char *path, const char *mode);
 #else
 /*
  * On other OSes, just use Boring Old fopen().
  */
-#define charset_fopen(path, mode)      fopen((path), (mode))
+#define pcap_charset_fopen(path, mode) fopen((path), (mode))
 #endif
 
 /*
@@ -646,7 +646,7 @@ int pcap_validate_filter(const struct bpf_insn *, int);
  */
 void   pcap_oneshot(u_char *, const struct pcap_pkthdr *, const u_char *);
 
-int    install_bpf_program(pcap_t *, struct bpf_program *);
+int    pcap_install_bpf_program(pcap_t *, struct bpf_program *);
 
 int    pcap_strcasecmp(const char *, const char *);