luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-05 12:20:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix multiple missing initializer warning in gio/tests/g-file.c

Browse Source 
gio/tests/g-file.c: In function ‘test_g_file_new_for_path’:
gio/tests/g-file.c:114:7: error: missing initializer for field ‘path3’ of ‘const struct TestPathsWithOper’
  114 |       {"/", TRUE, 0, "/./"},
      |       ^
gio/tests/g-file.c:115:7: error: missing initializer for field ‘path3’ of ‘const struct TestPathsWithOper’
  115 |       {"//", TRUE, 0, "//"},
      |       ^
...
This commit is contained in:
Emmanuel Fleury 2020-11-18 21:24:31 +01:00
parent afceb250ce
commit 7c909db13a
1 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
gio/tests/g-file.c
View File

@ -111,21 +111,21 @@ test_g_file_new_for_path (void)
{ {
const struct TestPathsWithOper cmp_paths[] = const struct TestPathsWithOper cmp_paths[] =
{ {
{"/", TRUE, 0, "/./"}, {"/", TRUE, 0, "/./", NULL },
{"//", TRUE, 0, "//"}, {"//", TRUE, 0, "//", NULL },
{"//", TRUE, 0, "//./"}, {"//", TRUE, 0, "//./", NULL },
{"/", TRUE, 0, "/.//"}, {"/", TRUE, 0, "/.//", NULL },
{"/", TRUE, 0, "/././"}, {"/", TRUE, 0, "/././", NULL },
{"/tmp", TRUE, 0, "/tmp/d/../"}, {"/tmp", TRUE, 0, "/tmp/d/../", NULL },
{"/", TRUE, 0, "/somedir/../"}, {"/", TRUE, 0, "/somedir/../", NULL },
{"/", FALSE, 0, "/somedir/.../"}, {"/", FALSE, 0, "/somedir/.../", NULL },
{"//tmp/dir1", TRUE, 0, "//tmp/dir1"}, {"//tmp/dir1", TRUE, 0, "//tmp/dir1", NULL },
{"/tmp/dir1", TRUE, 0, "///tmp/dir1"}, {"/tmp/dir1", TRUE, 0, "///tmp/dir1", NULL },
{"/tmp/dir1", TRUE, 0, "////tmp/dir1"}, {"/tmp/dir1", TRUE, 0, "////tmp/dir1", NULL },
{"/tmp/dir1", TRUE, 0, "/tmp/./dir1"}, {"/tmp/dir1", TRUE, 0, "/tmp/./dir1", NULL },
{"/tmp/dir1", TRUE, 0, "/tmp//dir1"}, {"/tmp/dir1", TRUE, 0, "/tmp//dir1", NULL },
{"/tmp/dir1", TRUE, 0, "/tmp///dir1///"}, {"/tmp/dir1", TRUE, 0, "/tmp///dir1///", NULL },
{"/UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88", TRUE, 0, "/UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88/"} {"/UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88", TRUE, 0, "/UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88/", NULL }
}; };
guint i; guint i;
@ -142,19 +142,19 @@ static void
test_g_file_new_for_uri (void) test_g_file_new_for_uri (void)
{ {
const struct TestPathsWithOper cmp_uris[] = { const struct TestPathsWithOper cmp_uris[] = {
{"file:///", TRUE, 0, "file:///./"}, {"file:///", TRUE, 0, "file:///./", NULL },
{"file:////", TRUE, 0, "file:////"}, {"file:////", TRUE, 0, "file:////", NULL },
{"file:////", TRUE, 0, "file:////./"}, {"file:////", TRUE, 0, "file:////./", NULL },
{"file:///", TRUE, 0, "file:///.//"}, {"file:///", TRUE, 0, "file:///.//", NULL },
{"file:///", TRUE, 0, "file:///././"}, {"file:///", TRUE, 0, "file:///././", NULL },
{"file:///tmp", TRUE, 0, "file:///tmp/d/../"}, {"file:///tmp", TRUE, 0, "file:///tmp/d/../", NULL },
{"file:///", TRUE, 0, "file:///somedir/../"}, {"file:///", TRUE, 0, "file:///somedir/../", NULL },
{"file:///", FALSE, 0, "file:///somedir/.../"}, {"file:///", FALSE, 0, "file:///somedir/.../", NULL },
{"file:////tmp/dir1", TRUE, 0, "file:////tmp/dir1"}, {"file:////tmp/dir1", TRUE, 0, "file:////tmp/dir1", NULL },
{"file:///tmp/dir1", TRUE, 0, "file:///tmp/./dir1"}, {"file:///tmp/dir1", TRUE, 0, "file:///tmp/./dir1", NULL },
{"file:///tmp/dir1", TRUE, 0, "file:///tmp//dir1"}, {"file:///tmp/dir1", TRUE, 0, "file:///tmp//dir1", NULL },
{"file:///tmp/dir1", TRUE, 0, "file:///tmp///dir1///"}, {"file:///tmp/dir1", TRUE, 0, "file:///tmp///dir1///", NULL },
{"file:///UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88", TRUE, 0, "file:///UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88/"} {"file:///UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88", TRUE, 0, "file:///UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88/", NULL }
}; };
guint i; guint i;
@ -198,11 +198,11 @@ test_g_file_dup (void)
{ {
const struct TestPathsWithOper dup_paths[] = const struct TestPathsWithOper dup_paths[] =
{ {
{"/", 0, FALSE, ""}, {"/", 0, FALSE, "", NULL },
{"file:///", 0, TRUE, ""}, {"file:///", 0, TRUE, "", NULL },
{"totalnonsense", 0, FALSE, ""}, {"totalnonsense", 0, FALSE, "", NULL },
{"/UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88", 0, FALSE, ""}, {"/UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88", 0, FALSE, "", NULL },
{"file:///UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88", 0, TRUE, ""}, {"file:///UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88", 0, TRUE, "", NULL },
}; };
guint i; guint i;
@ -261,11 +261,11 @@ test_g_file_get_parse_name_utf8 (void)
{ {
const struct TestPathsWithOper strings[] = const struct TestPathsWithOper strings[] =
{ {
{G_DIR_SEPARATOR_S, 0, FALSE, G_DIR_SEPARATOR_S}, {G_DIR_SEPARATOR_S, 0, FALSE, G_DIR_SEPARATOR_S, NULL },
{"file:///", 0, TRUE, G_DIR_SEPARATOR_S}, {"file:///", 0, TRUE, G_DIR_SEPARATOR_S, NULL },
{"totalnonsense", 0, FALSE, NULL}, {"totalnonsense", 0, FALSE, NULL, NULL },
{"/UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88", 0, FALSE, NULL /* Depends on local file encoding */}, {"/UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88", 0, FALSE, NULL, NULL /* Depends on local file encoding */},
{"file:///invalid%08/UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88/", 0, TRUE, "file:///invalid%08/UTF-8%20p\xc5\x99\xc3\xadli\xc5\xa1%20\xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd%20k\xc5\xaf\xc5\x88"}, {"file:///invalid%08/UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88/", 0, TRUE, "file:///invalid%08/UTF-8%20p\xc5\x99\xc3\xadli\xc5\xa1%20\xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd%20k\xc5\xaf\xc5\x88", NULL },
}; };
guint i; guint i;
@ -315,14 +315,14 @@ test_g_file_new_for_commandline_arg (void)
/* TestPathsWithOper.use_uri represents IsURIOnly here */ /* TestPathsWithOper.use_uri represents IsURIOnly here */
const struct TestPathsWithOper arg_data[] = const struct TestPathsWithOper arg_data[] =
{ {
{"./", 0, FALSE, "file"}, {"./", 0, FALSE, "file", NULL },
{"../", 0, FALSE, "file"}, {"../", 0, FALSE, "file", NULL },
{"/tmp", 0, FALSE, "file"}, {"/tmp", 0, FALSE, "file", NULL },
{"//UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88", 0, FALSE, "file"}, {"//UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88", 0, FALSE, "file", NULL },
{"file:///UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88/", 0, FALSE, "file"}, {"file:///UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88/", 0, FALSE, "file", NULL },
#if 0 #if 0
{"http://www.gtk.org/", 0, TRUE, "http"}, {"http://www.gtk.org/", 0, TRUE, "http", NULL },
{"ftp://user:pass@ftp.gimp.org/", 0, TRUE, "ftp"}, {"ftp://user:pass@ftp.gimp.org/", 0, TRUE, "ftp", NULL },
#endif #endif
}; };
GFile *file; GFile *file;
@ -486,15 +486,15 @@ test_g_file_get_parent_child (void)
const struct TestPathsWithOper paths[] = const struct TestPathsWithOper paths[] =
{ {
/* path root_desc uri dir_holder */ /* path root_desc uri dir_holder */
{"/dir1/dir", FALSE, FALSE, "dir"}, {"/dir1/dir", FALSE, FALSE, "dir", NULL },
{"/dir", FALSE, FALSE, "dir"}, {"/dir", FALSE, FALSE, "dir", NULL },
{"/", TRUE, FALSE, "dir"}, {"/", TRUE, FALSE, "dir", NULL },
{"/UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88/", FALSE, FALSE, "UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88"}, {"/UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88/", FALSE, FALSE, "UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88", NULL },
{"file:///dir1/dir", FALSE, TRUE, "dir"}, {"file:///dir1/dir", FALSE, TRUE, "dir", NULL },
{"file:///dir", FALSE, TRUE, "dir"}, {"file:///dir", FALSE, TRUE, "dir", NULL },
{"file:///", TRUE, TRUE, "dir"}, {"file:///", TRUE, TRUE, "dir", NULL },
{"file:///UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88/", FALSE, TRUE, "UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88"}, {"file:///UTF-8%20p%C5%99%C3%ADli%C5%A1%20%C5%BElu%C5%A5ou%C4%8Dk%C3%BD%20k%C5%AF%C5%88/", FALSE, TRUE, "UTF-8 p\xc5\x99\xc3\xadli\xc5\xa1 \xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd k\xc5\xaf\xc5\x88", NULL },
{"dav://www.gtk.org/plan/meetings", FALSE, TRUE, "meetings"}, {"dav://www.gtk.org/plan/meetings", FALSE, TRUE, "meetings", NULL },
}; };
guint i; guint i;