From 8e41e460e07732fbc584ab6b3572e403a6a76d91 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 14 May 2024 17:59:09 +0200
Subject: [PATCH] test: rename file with stub functions

icmp6-util-linux.c sounds like a specialized implementation of the functions in
icmp6-util.c. But it's just a set of stub versions used in tests. Rename the
file to make this more obvious.
---
 src/libsystemd-network/fuzz-ndisc-rs.c                      | 2 +-
 .../{icmp6-util-unix.c => icmp6-test-util.c}                | 2 +-
 .../{icmp6-util-unix.h => icmp6-test-util.h}                | 0
 src/libsystemd-network/meson.build                          | 6 +++---
 src/libsystemd-network/test-ndisc-ra.c                      | 2 +-
 src/libsystemd-network/test-ndisc-rs.c                      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename src/libsystemd-network/{icmp6-util-unix.c => icmp6-test-util.c} (97%)
 rename src/libsystemd-network/{icmp6-util-unix.h => icmp6-test-util.h} (100%)

diff --git a/src/libsystemd-network/fuzz-ndisc-rs.c b/src/libsystemd-network/fuzz-ndisc-rs.c
index 780a5d7f5a9..e6ee76895f8 100644
--- a/src/libsystemd-network/fuzz-ndisc-rs.c
+++ b/src/libsystemd-network/fuzz-ndisc-rs.c
@@ -11,7 +11,7 @@
 #include "fd-util.h"
 #include "fuzz.h"
 #include "icmp6-packet.h"
-#include "icmp6-util-unix.h"
+#include "icmp6-test-util.h"
 #include "ndisc-internal.h"
 #include "ndisc-option.h"
 #include "socket-util.h"
diff --git a/src/libsystemd-network/icmp6-util-unix.c b/src/libsystemd-network/icmp6-test-util.c
similarity index 97%
rename from src/libsystemd-network/icmp6-util-unix.c
rename to src/libsystemd-network/icmp6-test-util.c
index d6d505717d8..3c781095bc9 100644
--- a/src/libsystemd-network/icmp6-util-unix.c
+++ b/src/libsystemd-network/icmp6-test-util.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include "fd-util.h"
-#include "icmp6-util-unix.h"
+#include "icmp6-test-util.h"
 
 int test_fd[2] = EBADF_PAIR;
 
diff --git a/src/libsystemd-network/icmp6-util-unix.h b/src/libsystemd-network/icmp6-test-util.h
similarity index 100%
rename from src/libsystemd-network/icmp6-util-unix.h
rename to src/libsystemd-network/icmp6-test-util.h
diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build
index fdd8806a232..718495cd8eb 100644
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -91,13 +91,13 @@ executables += [
         network_test_template + {
                 'sources' : files(
                         'test-ndisc-ra.c',
-                        'icmp6-util-unix.c',
+                        'icmp6-test-util.c',
                 ),
         },
         network_test_template + {
                 'sources' : files(
                         'test-ndisc-rs.c',
-                        'icmp6-util-unix.c',
+                        'icmp6-test-util.c',
                 ),
         },
         network_test_template + {
@@ -125,7 +125,7 @@ executables += [
         network_fuzz_template + {
                 'sources' : files(
                         'fuzz-ndisc-rs.c',
-                        'icmp6-util-unix.c',
+                        'icmp6-test-util.c',
                 ),
         },
 ]
diff --git a/src/libsystemd-network/test-ndisc-ra.c b/src/libsystemd-network/test-ndisc-ra.c
index 8be7351a098..14c91645854 100644
--- a/src/libsystemd-network/test-ndisc-ra.c
+++ b/src/libsystemd-network/test-ndisc-ra.c
@@ -11,7 +11,7 @@
 
 #include "alloc-util.h"
 #include "hexdecoct.h"
-#include "icmp6-util-unix.h"
+#include "icmp6-test-util.h"
 #include "socket-util.h"
 #include "strv.h"
 #include "tests.h"
diff --git a/src/libsystemd-network/test-ndisc-rs.c b/src/libsystemd-network/test-ndisc-rs.c
index 5ad2c92b49c..66aad2600a3 100644
--- a/src/libsystemd-network/test-ndisc-rs.c
+++ b/src/libsystemd-network/test-ndisc-rs.c
@@ -13,7 +13,7 @@
 #include "fd-util.h"
 #include "hexdecoct.h"
 #include "icmp6-packet.h"
-#include "icmp6-util-unix.h"
+#include "icmp6-test-util.h"
 #include "socket-util.h"
 #include "strv.h"
 #include "ndisc-internal.h"
-- 
2.47.3