Move safememcpy() to util.c so it doesn't get inlined.

[tcpdump] / interface.h

diff --git a/interface.h b/interface.h
index 7c3a4683e6d20acd3e224385cdcb602724ded7bd..8ed4a4a8f747ff2bc40150e20d8b82d86612ccaf 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

- *
- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.285 2008-08-16 11:36:20 hannes Exp $ (LBL)

  */
 
 #ifndef tcpdump_interface_h
  */
 
 #ifndef tcpdump_interface_h


@@ -160,6 +158,8 @@ extern char *copy_argv(char **);
 extern void safeputchar(int);
 extern void safeputs(const char *, int);
 
 extern void safeputchar(int);
 extern void safeputs(const char *, int);
 

+extern void unaligned_memcpy(void *, const void *, size_t);
+

 extern const char *isonsap_string(const u_char *, register u_int);
 extern const char *protoid_string(const u_char *);
 extern const char *ipxsap_string(u_short);
 extern const char *isonsap_string(const u_char *, register u_int);
 extern const char *protoid_string(const u_char *);
 extern const char *ipxsap_string(u_short);


@@ -237,7 +237,7 @@ extern void ns_print(const u_char *, u_int, int);
 extern const u_char * ns_nprint (register const u_char *, register const u_char *);
 extern void ntp_print(const u_char *, u_int);
 extern u_int null_if_print(const struct pcap_pkthdr *, const u_char *);
 extern const u_char * ns_nprint (register const u_char *, register const u_char *);
 extern void ntp_print(const u_char *, u_int);
 extern u_int null_if_print(const struct pcap_pkthdr *, const u_char *);

-extern void openflow_print(const u_char *, u_int);
+extern void openflow_print(const u_char *, const u_int);

 extern void ospf_print(const u_char *, u_int, const u_char *);
 extern void olsr_print (const u_char *, u_int, int);
 extern void pimv1_print(const u_char *, u_int);
 extern void ospf_print(const u_char *, u_int, const u_char *);
 extern void olsr_print (const u_char *, u_int, int);
 extern void pimv1_print(const u_char *, u_int);


@@ -342,7 +342,7 @@ extern u_int usb_linux_48_byte_print(const struct pcap_pkthdr *, const u_char *)
 extern u_int usb_linux_64_byte_print(const struct pcap_pkthdr *, const u_char *);
 extern void vxlan_print(const u_char *, u_int);
 extern void otv_print(const u_char *, u_int);
 extern u_int usb_linux_64_byte_print(const struct pcap_pkthdr *, const u_char *);
 extern void vxlan_print(const u_char *, u_int);
 extern void otv_print(const u_char *, u_int);

-extern void ahcp_print(const u_char *, u_int);
+extern void ahcp_print(const u_char *, const u_int);

 
 
 #ifdef INET6
 
 
 #ifdef INET6