colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifcfg-rh/tests: drop out_*file args from connection_from_file_test()

Browse Source 
The out_keyfile, out_routefile, and out_route6file args were just
based on trivial calls to utils.h functions, and could just as easily
be done by the caller directly. So do that.
This commit is contained in:
Dan Winship
2014-12-16 10:33:16 -05:00
parent a564dafc35
commit 335dbda16b
3 changed files with 71 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/settings/plugins/ifcfg-rh/reader.c
View File

@@ -4629,9 +4629,6 @@ connection_from_file_full (const char *filename,
const char *network_file, /* for unit tests only */ const char *network_file, /* for unit tests only */
const char *test_type, /* for unit tests only */ const char *test_type, /* for unit tests only */
char **out_unhandled, char **out_unhandled,
char **out_keyfile,
char **out_routefile,
char **out_route6file,
GError **error, GError **error,
gboolean *out_ignore_error) gboolean *out_ignore_error)
{ {
@@ -4644,12 +4641,6 @@ connection_from_file_full (const char *filename,
g_return_val_if_fail (filename != NULL, NULL); g_return_val_if_fail (filename != NULL, NULL);
if (out_unhandled) if (out_unhandled)
g_return_val_if_fail (*out_unhandled == NULL, NULL); g_return_val_if_fail (*out_unhandled == NULL, NULL);
if (out_keyfile)
g_return_val_if_fail (*out_keyfile == NULL, NULL);
if (out_routefile)
g_return_val_if_fail (*out_routefile == NULL, NULL);
if (out_route6file)
g_return_val_if_fail (*out_route6file == NULL, NULL);
/* Non-NULL only for unit tests; normally use /etc/sysconfig/network */ /* Non-NULL only for unit tests; normally use /etc/sysconfig/network */
if (!network_file) if (!network_file)
@@ -4827,13 +4818,6 @@ connection_from_file_full (const char *filename,
connection = NULL; connection = NULL;
} }
if (out_keyfile)
*out_keyfile = utils_get_keys_path (filename);
if (out_routefile)
*out_routefile = utils_get_route_path (filename);
if (out_route6file)
*out_route6file = utils_get_route6_path (filename);
done: done:
svCloseFile (parsed); svCloseFile (parsed);
return connection; return connection;
@@ -4849,7 +4833,6 @@ connection_from_file (const char *filename,
conn = connection_from_file_full (filename, NULL, NULL, conn = connection_from_file_full (filename, NULL, NULL,
out_unhandled, out_unhandled,
NULL, NULL, NULL,
error, error,
&ignore_error); &ignore_error);
if (error && *error && !ignore_error) if (error && *error && !ignore_error)
@@ -4862,18 +4845,12 @@ connection_from_file_test (const char *filename,
const char *network_file, const char *network_file,
const char *test_type, const char *test_type,
char **out_unhandled, char **out_unhandled,
char **out_keyfile,
char **out_routefile,
char **out_route6file,
GError **error) GError **error)
{ {
return connection_from_file_full (filename, return connection_from_file_full (filename,
network_file, network_file,
test_type, test_type,
out_unhandled, out_unhandled,
out_keyfile,
out_routefile,
out_route6file,
error, error,
NULL); NULL);
} }

3
src/settings/plugins/ifcfg-rh/reader.h
View File

@@ -37,9 +37,6 @@ NMConnection *connection_from_file_test (const char *filename,
const char *network_file, const char *network_file,
const char *test_type, const char *test_type,
char **out_unhandled, char **out_unhandled,
char **out_keyfile,
char **out_routefile,
char **out_route6file,
GError **error); GError **error);
#endif /* __READER_H__ */ #endif /* __READER_H__ */

317
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View File

File diff suppressed because it is too large Load Diff