From ad1112a851a7e8591a728a128e9c846ae198c05b Mon Sep 17 00:00:00 2001 From: Kaian Date: Thu, 6 Dec 2018 14:19:09 +0100 Subject: [PATCH] glib: rename glib-utils to glib-extra sources --- CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/call.c | 2 +- src/capture/capture_hep.c | 2 +- src/capture/capture_pcap.c | 2 +- src/filter.c | 2 +- src/{glib-utils.c => glib-extra.c} | 2 +- src/{glib-utils.h => glib-extra.h} | 0 src/group.c | 2 +- src/message.c | 2 +- src/ncurses/manager.c | 2 +- src/ncurses/windows/auth_validate_win.c | 2 +- src/ncurses/windows/call_flow_win.c | 2 +- src/ncurses/windows/call_list_win.c | 2 +- src/ncurses/windows/column_select_win.c | 2 +- src/ncurses/windows/save_win.c | 2 +- src/ncurses/windows/stats_win.c | 2 +- src/packet/dissectors/packet_hep.c | 2 +- src/packet/dissectors/packet_ip.c | 2 +- src/packet/dissectors/packet_link.c | 2 +- src/packet/dissectors/packet_rtcp.c | 2 +- src/packet/dissectors/packet_rtp.c | 2 +- src/packet/dissectors/packet_sdp.c | 2 +- src/packet/dissectors/packet_sip.c | 2 +- src/packet/dissectors/packet_tcp.c | 2 +- src/packet/dissectors/packet_tls.c | 2 +- src/packet/dissectors/packet_udp.c | 2 +- src/packet/packet.c | 2 +- src/setting.c | 2 +- src/storage.c | 2 +- src/stream.c | 2 +- 31 files changed, 30 insertions(+), 30 deletions(-) rename src/{glib-utils.c => glib-extra.c} (99%) rename src/{glib-utils.h => glib-extra.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03df5e8..6d398fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ set(SOURCES src/call.c src/message.c src/timeval.c - src/glib-utils.c + src/glib-extra.c ) ###################################################################### diff --git a/src/Makefile.am b/src/Makefile.am index c6c170f..7e74a08 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,7 +35,7 @@ sngrep_SOURCES+=call.c sngrep_SOURCES+=message.c sngrep_SOURCES+=timeval.c sngrep_SOURCES+=setting.c -sngrep_SOURCES+=glib-utils.c +sngrep_SOURCES+=glib-extra.c sngrep_SOURCES+=storage.c sngrep_SOURCES+=ncurses/keybinding.c sngrep_SOURCES+=ncurses/scrollbar.c diff --git a/src/call.c b/src/call.c index 6c8877f..6b1d178 100644 --- a/src/call.c +++ b/src/call.c @@ -30,7 +30,7 @@ */ #include "config.h" #include -#include "glib-utils.h" +#include "glib-extra.h" #include "call.h" #include "packet/dissectors/packet_sip.h" #include "storage.h" diff --git a/src/capture/capture_hep.c b/src/capture/capture_hep.c index de8d3ce..f1c89b5 100644 --- a/src/capture/capture_hep.c +++ b/src/capture/capture_hep.c @@ -49,7 +49,7 @@ #include #include "timeval.h" #include "setting.h" -#include "glib-utils.h" +#include "glib-extra.h" #include "packet/dissectors/packet_hep.h" #include "packet/dissectors/packet_ip.h" #include "packet/dissectors/packet_udp.h" diff --git a/src/capture/capture_pcap.c b/src/capture/capture_pcap.c index d37f7dc..4ea43e3 100644 --- a/src/capture/capture_pcap.c +++ b/src/capture/capture_pcap.c @@ -36,7 +36,7 @@ #include #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "capture.h" #include "capture_hep.h" #include "capture_pcap.h" diff --git a/src/filter.c b/src/filter.c index 1d84f88..5589267 100644 --- a/src/filter.c +++ b/src/filter.c @@ -29,7 +29,7 @@ #include "config.h" #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "storage.h" #include "ncurses/windows/call_list_win.h" #include "filter.h" diff --git a/src/glib-utils.c b/src/glib-extra.c similarity index 99% rename from src/glib-utils.c rename to src/glib-extra.c index e077f9f..e7e7e5a 100644 --- a/src/glib-utils.c +++ b/src/glib-extra.c @@ -26,7 +26,7 @@ * @brief Helper function for glib containers * */ -#include "glib-utils.h" +#include "glib-extra.h" gpointer g_sequence_nth(GSequence *sequence, guint index) diff --git a/src/glib-utils.h b/src/glib-extra.h similarity index 100% rename from src/glib-utils.h rename to src/glib-extra.h diff --git a/src/group.c b/src/group.c index 76a1cbf..bb81348 100644 --- a/src/group.c +++ b/src/group.c @@ -30,7 +30,7 @@ #include #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "group.h" CallGroup * diff --git a/src/message.c b/src/message.c index 6b4986f..918c776 100644 --- a/src/message.c +++ b/src/message.c @@ -30,7 +30,7 @@ */ #include "config.h" #include -#include "glib-utils.h" +#include "glib-extra.h" #include "message.h" #include "packet/dissectors/packet_sip.h" #include "packet/dissectors/packet_sdp.h" diff --git a/src/ncurses/manager.c b/src/ncurses/manager.c index c63e65d..855b21d 100644 --- a/src/ncurses/manager.c +++ b/src/ncurses/manager.c @@ -32,7 +32,7 @@ #include #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "setting.h" #include "manager.h" #include "packet/dissectors/packet_sip.h" diff --git a/src/ncurses/windows/auth_validate_win.c b/src/ncurses/windows/auth_validate_win.c index a821a6a..b92c69d 100644 --- a/src/ncurses/windows/auth_validate_win.c +++ b/src/ncurses/windows/auth_validate_win.c @@ -28,7 +28,7 @@ #include "config.h" #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "auth_validate_win.h" #include "setting.h" diff --git a/src/ncurses/windows/call_flow_win.c b/src/ncurses/windows/call_flow_win.c index 1f50805..99de3d7 100644 --- a/src/ncurses/windows/call_flow_win.c +++ b/src/ncurses/windows/call_flow_win.c @@ -39,7 +39,7 @@ #include "auth_validate_win.h" #include "save_win.h" #include "timeval.h" -#include "glib-utils.h" +#include "glib-extra.h" #include "setting.h" /*** diff --git a/src/ncurses/windows/call_list_win.c b/src/ncurses/windows/call_list_win.c index 764553e..aad7dfe 100644 --- a/src/ncurses/windows/call_list_win.c +++ b/src/ncurses/windows/call_list_win.c @@ -33,7 +33,7 @@ #include #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "setting.h" #include "filter.h" #include "capture/capture_pcap.h" diff --git a/src/ncurses/windows/column_select_win.c b/src/ncurses/windows/column_select_win.c index 9736414..79d922d 100644 --- a/src/ncurses/windows/column_select_win.c +++ b/src/ncurses/windows/column_select_win.c @@ -34,7 +34,7 @@ #include #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "ncurses/manager.h" #include "call_list_win.h" #include "column_select_win.h" diff --git a/src/ncurses/windows/save_win.c b/src/ncurses/windows/save_win.c index 4f11b3f..367b316 100644 --- a/src/ncurses/windows/save_win.c +++ b/src/ncurses/windows/save_win.c @@ -34,7 +34,7 @@ #include #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "save_win.h" #include "setting.h" #include "capture/capture_pcap.h" diff --git a/src/ncurses/windows/stats_win.c b/src/ncurses/windows/stats_win.c index 30c0a6c..ee42c80 100644 --- a/src/ncurses/windows/stats_win.c +++ b/src/ncurses/windows/stats_win.c @@ -55,7 +55,7 @@ */ #include "config.h" #include -#include "glib-utils.h" +#include "glib-extra.h" #include "storage.h" #include "packet/dissectors/packet_sip.h" #include "stats_win.h" diff --git a/src/packet/dissectors/packet_hep.c b/src/packet/dissectors/packet_hep.c index a51a6b1..37617ff 100644 --- a/src/packet/dissectors/packet_hep.c +++ b/src/packet/dissectors/packet_hep.c @@ -32,7 +32,7 @@ #include "config.h" #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "packet/dissectors/packet_ip.h" #include "packet/dissectors/packet_udp.h" #include "packet/packet.h" diff --git a/src/packet/dissectors/packet_ip.c b/src/packet/dissectors/packet_ip.c index 86943cb..29d959e 100644 --- a/src/packet/dissectors/packet_ip.c +++ b/src/packet/dissectors/packet_ip.c @@ -32,7 +32,7 @@ #include "config.h" #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "packet/packet.h" #include "packet/parser.h" #include "packet/dissectors/packet_ip.h" diff --git a/src/packet/dissectors/packet_link.c b/src/packet/dissectors/packet_link.c index 511219c..077f30d 100644 --- a/src/packet/dissectors/packet_link.c +++ b/src/packet/dissectors/packet_link.c @@ -34,7 +34,7 @@ #ifdef DLT_LINUX_SLL #include #endif -#include "glib-utils.h" +#include "glib-extra.h" #include "capture/capture_pcap.h" #include "packet_ip.h" #include "packet_link.h" diff --git a/src/packet/dissectors/packet_rtcp.c b/src/packet/dissectors/packet_rtcp.c index a9fd24f..a85017d 100644 --- a/src/packet/dissectors/packet_rtcp.c +++ b/src/packet/dissectors/packet_rtcp.c @@ -28,7 +28,7 @@ #include "config.h" #include -#include "glib-utils.h" +#include "glib-extra.h" #include "storage.h" #include "packet/dissector.h" #include "packet/packet.h" diff --git a/src/packet/dissectors/packet_rtp.c b/src/packet/dissectors/packet_rtp.c index eee3f01..4c7745b 100644 --- a/src/packet/dissectors/packet_rtp.c +++ b/src/packet/dissectors/packet_rtp.c @@ -28,7 +28,7 @@ #include "config.h" #include -#include "glib-utils.h" +#include "glib-extra.h" #include "storage.h" #include "packet/dissector.h" #include "packet/packet.h" diff --git a/src/packet/dissectors/packet_sdp.c b/src/packet/dissectors/packet_sdp.c index 3ef607c..4ec4f80 100644 --- a/src/packet/dissectors/packet_sdp.c +++ b/src/packet/dissectors/packet_sdp.c @@ -28,7 +28,7 @@ #include "config.h" #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "packet_sdp.h" /** diff --git a/src/packet/dissectors/packet_sip.c b/src/packet/dissectors/packet_sip.c index f5f9c96..c7185fb 100644 --- a/src/packet/dissectors/packet_sip.c +++ b/src/packet/dissectors/packet_sip.c @@ -28,7 +28,7 @@ #include "config.h" #include -#include "glib-utils.h" +#include "glib-extra.h" #include "storage.h" #include "packet/packet.h" #include "packet/dissectors/packet_tcp.h" diff --git a/src/packet/dissectors/packet_tcp.c b/src/packet/dissectors/packet_tcp.c index 5217503..2e7efa9 100644 --- a/src/packet/dissectors/packet_tcp.c +++ b/src/packet/dissectors/packet_tcp.c @@ -29,7 +29,7 @@ * */ -#include +#include #include #include "config.h" #include "packet/packet.h" diff --git a/src/packet/dissectors/packet_tls.c b/src/packet/dissectors/packet_tls.c index 5a62f3c..bcc9eae 100644 --- a/src/packet/dissectors/packet_tls.c +++ b/src/packet/dissectors/packet_tls.c @@ -34,7 +34,7 @@ #include #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "capture/capture.h" #include "packet/dissector.h" #include "packet/dissectors/packet_ip.h" diff --git a/src/packet/dissectors/packet_udp.c b/src/packet/dissectors/packet_udp.c index 5d63930..fba8840 100644 --- a/src/packet/dissectors/packet_udp.c +++ b/src/packet/dissectors/packet_udp.c @@ -31,7 +31,7 @@ #include "config.h" #include -#include "glib-utils.h" +#include "glib-extra.h" #include "packet/dissectors/packet_ip.h" #include "packet/packet.h" #include "packet_udp.h" diff --git a/src/packet/packet.c b/src/packet/packet.c index 1fd1efb..2e01ebb 100644 --- a/src/packet/packet.c +++ b/src/packet/packet.c @@ -28,7 +28,7 @@ */ #include "config.h" #include -#include "glib-utils.h" +#include "glib-extra.h" #include "packet/dissectors/packet_ip.h" #include "packet/dissectors/packet_tcp.h" #include "packet/dissectors/packet_udp.h" diff --git a/src/setting.c b/src/setting.c index 527c146..12a4ae3 100644 --- a/src/setting.c +++ b/src/setting.c @@ -32,7 +32,7 @@ #include #include #include "ncurses/keybinding.h" -#include "glib-utils.h" +#include "glib-extra.h" #include "setting.h" #include "timeval.h" diff --git a/src/storage.c b/src/storage.c index 1347592..51b61d3 100644 --- a/src/storage.c +++ b/src/storage.c @@ -51,7 +51,7 @@ #include "config.h" #include #include -#include "glib-utils.h" +#include "glib-extra.h" #include "packet/dissectors/packet_sip.h" #include "storage.h" #include "setting.h" diff --git a/src/stream.c b/src/stream.c index 09d080e..6687e9b 100644 --- a/src/stream.c +++ b/src/stream.c @@ -30,7 +30,7 @@ */ #include "config.h" #include -#include "glib-utils.h" +#include "glib-extra.h" #include "stream.h" #include "storage.h"