net: move print_ifindex to a separate file

* print_ifindex.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* net.c (print_ifindex): Move to print_ifindex.c.

diff --git a/Makefile.am b/Makefile.am
index e7fb6869dc6d81076cb78b7e9e5969af9104ae46..9b966bc5672153c97748720adde284d003b563cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -201,6 +201,7 @@ strace_SOURCES =    \
        prctl.c         \
        print_dev_t.c   \
        print_fields.h  \
+       print_ifindex.c \
        print_mq_attr.c \
        print_msgbuf.c  \
        print_sg_req_info.c \

diff --git a/net.c b/net.c
index ef11cb88fee696979c50c39b3ea992fa83ff41c5..872a728c9d3b1bc50e7114c686bc4fabc107da3a 100644 (file)
--- a/net.c
+++ b/net.c
@@ -89,22 +89,6 @@
 # include "xlat/bt_protocols.h"
 #endif
 
-void
-print_ifindex(unsigned int ifindex)
-{
-#ifdef HAVE_IF_INDEXTONAME
-       char buf[IFNAMSIZ + 1];
-
-       if (if_indextoname(ifindex, buf)) {
-               tprints("if_nametoindex(");
-               print_quoted_string(buf, sizeof(buf), QUOTE_0_TERMINATED);
-               tprints(")");
-               return;
-       }
-#endif
-       tprintf("%u", ifindex);
-}
-
 static void
 decode_sockbuf(struct tcb *const tcp, const int fd, const kernel_ulong_t addr,
               const kernel_ulong_t addrlen)

diff --git a/print_ifindex.c b/print_ifindex.c
new file mode 100644 (file)
index 0000000..21f68f6
--- /dev/null
+++ b/print_ifindex.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2001-2017 The strace developers.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "defs.h"
+#include <net/if.h>
+
+void
+print_ifindex(const unsigned int ifindex)
+{
+#ifdef HAVE_IF_INDEXTONAME
+       char buf[IFNAMSIZ + 1];
+
+       if (if_indextoname(ifindex, buf)) {
+               tprints("if_nametoindex(");
+               print_quoted_string(buf, sizeof(buf), QUOTE_0_TERMINATED);
+               tprints(")");
+               return;
+       }
+#endif
+
+       tprintf("%u", ifindex);
+}