lib/remote: Add arguments to internal OstreeRemote constructor
Add a name argument to the internal OstreeRemote constructor, since this member (and several derived from it) is non-nullable, and hence must always be set at construction time. This changes the only call sites of the constructor to use the new API, which is internal. Signed-off-by: Philip Withnall <withnall@endlessm.com> Closes: #875 Approved by: cgwalters
This commit is contained in:
1 parent
2910b88081
commit
ed7905d000
3 files changed
+11
-10
No files matched your search
@@ -53,12 +53,17 @@
|
||||
*/
|
||||
|
||||
OstreeRemote *
|
||||
ostree_remote_new (void)
|
||||
ostree_remote_new (const gchar *name)
|
||||
{
|
||||
OstreeRemote *remote;
|
||||
|
||||
g_return_val_if_fail (name != NULL && *name != '\0', NULL);
|
||||
|
||||
remote = g_slice_new0 (OstreeRemote);
|
||||
remote->ref_count = 1;
|
||||
remote->name = g_strdup (name);
|
||||
remote->group = g_strdup_printf ("remote \"%s\"", name);
|
||||
remote->keyring = g_strdup_printf ("%s.trustedkeys.gpg", name);
|
||||
remote->options = g_key_file_new ();
|
||||
|
||||
return remote;
|
||||
@@ -70,6 +75,7 @@ ostree_remote_new_from_keyfile (GKeyFile *keyfile,
|
||||
{
|
||||
g_autoptr(GMatchInfo) match = NULL;
|
||||
OstreeRemote *remote;
|
||||
g_autofree gchar *name = NULL;
|
||||
|
||||
static gsize regex_initialized;
|
||||
static GRegex *regex;
|
||||
@@ -88,10 +94,8 @@ ostree_remote_new_from_keyfile (GKeyFile *keyfile,
|
||||
if (!g_regex_match (regex, group, 0, &match))
|
||||
return NULL;
|
||||
|
||||
remote = ostree_remote_new ();
|
||||
remote->name = g_match_info_fetch (match, 1);
|
||||
remote->group = g_strdup (group);
|
||||
remote->keyring = g_strdup_printf ("%s.trustedkeys.gpg", remote->name);
|
||||
name = g_match_info_fetch (match, 1);
|
||||
remote = ostree_remote_new (name);
|
||||
|
||||
ot_keyfile_copy_group (keyfile, remote->options, group);
|
||||
|
||||
|
||||
Reference in new issue
Block a user