Display and control your Android device
Move str_util to str
Romain Vimont057c7a4df4ec
diff --git a/app/meson.build b/app/meson.buildindex 7abef1e2..4894babc 100644--- a/app/meson.build+++ b/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',]],]diff --git a/app/src/adb.c b/app/src/adb.cindex 39777f12..6251174e 100644--- a/app/src/adb.c+++ b/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;diff --git a/app/src/cli.c b/app/src/cli.cindex d46485b2..1550c706 100644--- a/app/src/cli.c+++ b/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) #xdiff --git a/app/src/control_msg.c b/app/src/control_msg.cindex ea552bc2..74e3315c 100644--- a/app/src/control_msg.c+++ b/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 andiff --git a/app/src/icon.c b/app/src/icon.cindex 8e18b102..a3efbb01 100644--- a/app/src/icon.c+++ b/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 \diff --git a/app/src/recorder.c b/app/src/recorder.cindex 20e4340f..b9c585f4 100644--- a/app/src/recorder.c+++ b/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)diff --git a/app/src/server.c b/app/src/server.cindex 0edd8a05..29c92eb3 100644--- a/app/src/server.c+++ b/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"diff --git a/app/src/sys/win/file.c b/app/src/sys/win/file.cindex 650e0b4b..5233b177 100644--- a/app/src/sys/win/file.c+++ b/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) {diff --git a/app/src/sys/win/process.c b/app/src/sys/win/process.cindex cfbb3948..4dcd542e 100644--- a/app/src/sys/win/process.c+++ b/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 8192diff --git a/app/src/util/str_util.c b/app/src/util/str.csimilarity index 99%rename from app/src/util/str_util.crename to app/src/util/str.cindex d15dad20..7935c6bb 100644--- a/app/src/util/str_util.c+++ b/app/src/util/str.c@@ -1,4 +1,4 @@-#include "str_util.h"+#include "str.h"#include <assert.h>#include <errno.h>diff --git a/app/src/util/str_util.h b/app/src/util/str.hsimilarity index 98%rename from app/src/util/str_util.hrename to app/src/util/str.hindex 47e01344..54e32808 100644--- a/app/src/util/str_util.h+++ b/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"diff --git a/app/src/v4l2_sink.c b/app/src/v4l2_sink.cindex a35a9096..753d5b6a 100644--- a/app/src/v4l2_sink.c+++ b/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)diff --git a/app/tests/test_strutil.c b/app/tests/test_str.csimilarity index 99%rename from app/tests/test_strutil.crename to app/tests/test_str.cindex 6a53f94b..2b030885 100644--- a/app/tests/test_strutil.c+++ b/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";