glib: rename glib-utils to glib-extra sources

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
 )
 
 ######################################################################

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

src/call.c

@@ -30,7 +30,7 @@
  */
 #include "config.h"
 #include <glib.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "call.h"
 #include "packet/dissectors/packet_sip.h"
 #include "storage.h"

src/capture/capture_hep.c

@@ -49,7 +49,7 @@
 #include <string.h>
 #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"

src/capture/capture_pcap.c

@@ -36,7 +36,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include <pcap/sll.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "capture.h"
 #include "capture_hep.h"
 #include "capture_pcap.h"

src/filter.c

@@ -29,7 +29,7 @@
 #include "config.h"
 #include <glib.h>
 #include <stdlib.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "storage.h"
 #include "ncurses/windows/call_list_win.h"
 #include "filter.h"

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)

src/group.c

@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <string.h>
 #include <stdlib.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "group.h"
 
 CallGroup *

src/message.c

@@ -30,7 +30,7 @@
  */
 #include "config.h"
 #include <glib.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "message.h"
 #include "packet/dissectors/packet_sip.h"
 #include "packet/dissectors/packet_sdp.h"

src/ncurses/manager.c

@@ -32,7 +32,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <locale.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "setting.h"
 #include "manager.h"
 #include "packet/dissectors/packet_sip.h"

src/ncurses/windows/auth_validate_win.c

@@ -28,7 +28,7 @@
 #include "config.h"
 #include <glib.h>
 #include <packet/dissectors/packet_sip.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "auth_validate_win.h"
 #include "setting.h"
 

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"
 
 /***

src/ncurses/windows/call_list_win.c

@@ -33,7 +33,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "setting.h"
 #include "filter.h"
 #include "capture/capture_pcap.h"

src/ncurses/windows/column_select_win.c

@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <glib/gstdio.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "ncurses/manager.h"
 #include "call_list_win.h"
 #include "column_select_win.h"

src/ncurses/windows/save_win.c

@@ -34,7 +34,7 @@
 #include <errno.h>
 #include <form.h>
 #include <ctype.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "save_win.h"
 #include "setting.h"
 #include "capture/capture_pcap.h"

src/ncurses/windows/stats_win.c

@@ -55,7 +55,7 @@
  */
 #include "config.h"
 #include <glib.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "storage.h"
 #include "packet/dissectors/packet_sip.h"
 #include "stats_win.h"

src/packet/dissectors/packet_hep.c

@@ -32,7 +32,7 @@
 #include "config.h"
 #include <netinet/udp.h>
 #include <arpa/inet.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "packet/dissectors/packet_ip.h"
 #include "packet/dissectors/packet_udp.h"
 #include "packet/packet.h"

src/packet/dissectors/packet_ip.c

@@ -32,7 +32,7 @@
 #include "config.h"
 #include <netdb.h>
 #include <arpa/inet.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "packet/packet.h"
 #include "packet/parser.h"
 #include "packet/dissectors/packet_ip.h"

src/packet/dissectors/packet_link.c

@@ -34,7 +34,7 @@
 #ifdef DLT_LINUX_SLL
 #include <pcap/sll.h>
 #endif
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "capture/capture_pcap.h"
 #include "packet_ip.h"
 #include "packet_link.h"

src/packet/dissectors/packet_rtcp.c

@@ -28,7 +28,7 @@
 
 #include "config.h"
 #include <glib.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "storage.h"
 #include "packet/dissector.h"
 #include "packet/packet.h"

src/packet/dissectors/packet_rtp.c

@@ -28,7 +28,7 @@
 
 #include "config.h"
 #include <glib.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "storage.h"
 #include "packet/dissector.h"
 #include "packet/packet.h"

src/packet/dissectors/packet_sdp.c

@@ -28,7 +28,7 @@
 #include "config.h"
 #include <glib.h>
 #include <stdlib.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "packet_sdp.h"
 
 /**

src/packet/dissectors/packet_sip.c

@@ -28,7 +28,7 @@
 
 #include "config.h"
 #include <stdlib.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "storage.h"
 #include "packet/packet.h"
 #include "packet/dissectors/packet_tcp.h"

src/packet/dissectors/packet_tcp.c

@@ -29,7 +29,7 @@
  *
  */
 
-#include <glib-utils.h>
+#include <glib-extra.h>
 #include <glib/gprintf.h>
 #include "config.h"
 #include "packet/packet.h"

src/packet/dissectors/packet_tls.c

@@ -34,7 +34,7 @@
 #include <errno.h>
 #include <arpa/inet.h>
 #include <gnutls/gnutls.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "capture/capture.h"
 #include "packet/dissector.h"
 #include "packet/dissectors/packet_ip.h"

src/packet/dissectors/packet_udp.c

@@ -31,7 +31,7 @@
 
 #include "config.h"
 #include <netinet/udp.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "packet/dissectors/packet_ip.h"
 #include "packet/packet.h"
 #include "packet_udp.h"

src/packet/packet.c

@@ -28,7 +28,7 @@
  */
 #include "config.h"
 #include <glib.h>
-#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"

src/setting.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "ncurses/keybinding.h"
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "setting.h"
 #include "timeval.h"
 

src/storage.c

@@ -51,7 +51,7 @@
 #include "config.h"
 #include <glib.h>
 #include <glib/gprintf.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "packet/dissectors/packet_sip.h"
 #include "storage.h"
 #include "setting.h"

src/stream.c

@@ -30,7 +30,7 @@
  */
 #include "config.h"
 #include <glib.h>
-#include "glib-utils.h"
+#include "glib-extra.h"
 #include "stream.h"
 #include "storage.h"