Move str_util to str

Simplify naming.

app/meson.build

@@ -33,7 +33,7 @@ src = [
     'src/util/process.c',
     'src/util/process_intr.c',
     'src/util/strbuf.c',
-    'src/util/str_util.c',
+    'src/util/str.c',
     'src/util/term.c',
     'src/util/thread.c',
     'src/util/tick.c',
@@ -199,8 +199,8 @@ if get_option('buildtype') == 'debug'
             'tests/test_cli.c',
             'src/cli.c',
             'src/options.c',
+            'src/util/str.c',
             'src/util/strbuf.c',
-            'src/util/str_util.c',
             'src/util/term.c',
         ]],
         ['test_clock', [
@@ -210,8 +210,8 @@ if get_option('buildtype') == 'debug'
         ['test_control_msg_serialize', [
             'tests/test_control_msg_serialize.c',
             'src/control_msg.c',
+            'src/util/str.c',
             'src/util/strbuf.c',
-            'src/util/str_util.c',
         ]],
         ['test_device_msg_deserialize', [
             'tests/test_device_msg_deserialize.c',
@@ -224,10 +224,10 @@ if get_option('buildtype') == 'debug'
             'tests/test_strbuf.c',
             'src/util/strbuf.c',
         ]],
-        ['test_strutil', [
-            'tests/test_strutil.c',
+        ['test_str', [
+            'tests/test_str.c',
+            'src/util/str.c',
             'src/util/strbuf.c',
-            'src/util/str_util.c',
         ]],
     ]
 

app/src/adb.c

@@ -7,7 +7,7 @@
 
 #include "util/file.h"
 #include "util/log.h"
-#include "util/str_util.h"
+#include "util/str.h"
 
 static const char *adb_command;
 

app/src/cli.c

@@ -9,8 +9,8 @@
 
 #include "options.h"
 #include "util/log.h"
+#include "util/str.h"
 #include "util/strbuf.h"
-#include "util/str_util.h"
 #include "util/term.h"
 
 #define STR_IMPL_(x) #x

app/src/control_msg.c

@@ -7,7 +7,7 @@
 
 #include "util/buffer_util.h"
 #include "util/log.h"
-#include "util/str_util.h"
+#include "util/str.h"
 
 /**
  * Map an enum value to a string based on an array, without crashing on an

app/src/icon.c

@@ -10,7 +10,7 @@
 #include "compat.h"
 #include "util/file.h"
 #include "util/log.h"
-#include "util/str_util.h"
+#include "util/str.h"
 
 #define SCRCPY_PORTABLE_ICON_FILENAME "icon.png"
 #define SCRCPY_DEFAULT_ICON_PATH \

app/src/recorder.c

@@ -6,7 +6,7 @@
 #include <libavutil/time.h>
 
 #include "util/log.h"
-#include "util/str_util.h"
+#include "util/str.h"
 
 /** Downcast packet_sink to recorder */
 #define DOWNCAST(SINK) container_of(SINK, struct recorder, packet_sink)

app/src/server.c

@@ -12,7 +12,7 @@
 #include "util/log.h"
 #include "util/net_intr.h"
 #include "util/process_intr.h"
-#include "util/str_util.h"
+#include "util/str.h"
 
 #define SERVER_FILENAME "scrcpy-server"
 

app/src/sys/win/file.c

@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 
 #include "util/log.h"
-#include "util/str_util.h"
+#include "util/str.h"
 
 char *
 sc_file_get_executable_path(void) {

app/src/sys/win/process.c

@@ -3,7 +3,7 @@
 #include <assert.h>
 
 #include "util/log.h"
-#include "util/str_util.h"
+#include "util/str.h"
 
 #define CMD_MAX_LEN 8192
 

app/src/util/str.c

@@ -1,4 +1,4 @@
-#include "str_util.h"
+#include "str.h"
 
 #include <assert.h>
 #include <errno.h>

app/src/util/str.h

@@ -1,5 +1,5 @@
-#ifndef SC_STRUTIL_H
-#define SC_STRUTIL_H
+#ifndef SC_STR_H
+#define SC_STR_H
 
 #include "common.h"
 

app/src/v4l2_sink.c

@@ -1,7 +1,7 @@
 #include "v4l2_sink.h"
 
 #include "util/log.h"
-#include "util/str_util.h"
+#include "util/str.h"
 
 /** Downcast frame_sink to sc_v4l2_sink */
 #define DOWNCAST(SINK) container_of(SINK, struct sc_v4l2_sink, frame_sink)

app/tests/test_str.c

@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "util/str_util.h"
+#include "util/str.h"
 
 static void test_strncpy_simple(void) {
     char s[] = "xxxxxxxxxx";