shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

tree-wide: fix the string concatenation warning with clang-12

Browse Source 
e.g.:
./src/shared/dissect-image.c:2218:39: error: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Werror,-Wstring-concatenation]
                                      "/usr/lib/os-release\0",
                                      ^
../src/shared/dissect-image.c:2217:39: note: place parentheses around the string literal to silence warning
                [META_OS_RELEASE]   = "/etc/os-release\0"
                                      ^
1 error generated.

See: https://reviews.llvm.org/D85545
This commit is contained in:
Frantisek Sumsal 2021-02-08 11:26:26 +01:00
parent 19db2f4258
commit 8762049792
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/dissect-image.c
View File

@ -2214,8 +2214,8 @@ int dissected_image_acquire_metadata(DissectedImage *m) {
[META_HOSTNAME] = "/etc/hostname\0",
[META_MACHINE_ID] = "/etc/machine-id\0",
[META_MACHINE_INFO] = "/etc/machine-info\0",
[META_OS_RELEASE] = "/etc/os-release\0"
"/usr/lib/os-release\0",
[META_OS_RELEASE] = ("/etc/os-release\0"
"/usr/lib/os-release\0"),
};
_cleanup_strv_free_ char **machine_info = NULL, **os_release = NULL;

18
src/xdg-autostart-generator/test-xdg-autostart.c
View File

@ -37,17 +37,17 @@ static void test_xdg_format_exec_start(void) {
}
static const char* const xdg_desktop_file[] = {
"[Desktop Entry]\n"
"Exec\t =\t /bin/sleep 100\n" /* Whitespace Before/After = must be ignored */
"OnlyShowIn = A;B;\n"
"NotShowIn=C;;D\\\\\\;;E\n", /* "C", "", "D\;", "E" */
("[Desktop Entry]\n"
"Exec\t =\t /bin/sleep 100\n" /* Whitespace Before/After = must be ignored */
"OnlyShowIn = A;B;\n"
"NotShowIn=C;;D\\\\\\;;E\n"), /* "C", "", "D\;", "E" */
"[Desktop Entry]\n"
"Exec=a\n"
"Exec=b\n",
("[Desktop Entry]\n"
"Exec=a\n"
"Exec=b\n"),
"[Desktop Entry]\n"
"Hidden=\t true\n",
("[Desktop Entry]\n"
"Hidden=\t true\n"),
};
static void test_xdg_desktop_parse(unsigned i, const char *s) {