summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2019-07-28 15:48:06 +0000
committerJason Woodward2019-07-28 15:48:06 +0000
commit3dca65aaa672997c55b4123daf85947114ae8a4b (patch)
tree20d507b1d1234eba77ccb542457849fff923f228
parent0e0be779aaa3e1fe2965e7118e82d456b5b2b887 (diff)
downloadslapt-update-service-3dca65aaa672997c55b4123daf85947114ae8a4b.tar.gz
update naming convention for data structuresslapt_vector
s/slapt_pkg_into_t/slapt_pkg_t/g s/slapt_free_pkg/slapt_pkg_t_free/g s/slapt_init_pkg/slapt_pkg_t_init/g s/slapt_rc_config/slapt_config_t/ s/slapt_init_config/slapt_config_t_init/g s/slapt_read_rc_config/slapt_config_t_read/g s/slapt_free_rc_config/slapt_config_t_free/g s/slapt_free_source/slapt_source_t_free/g s/slapt_init_source/slapt_source_t_init/g s/slapt_write_rc_config/slapt_config_t_write/g
-rw-r--r--src/slaptService.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/slaptService.c b/src/slaptService.c
index d61416e..f08f4d1 100644
--- a/src/slaptService.c
+++ b/src/slaptService.c
@@ -32,13 +32,13 @@ static gboolean slapt_service_real_check_for_updates(SlaptService *self, guint *
slapt_vector_t *installed_pkgs = NULL;
slapt_vector_t *avail_pkgs = NULL;
slapt_transaction_t *tran = NULL;
- slapt_rc_config *rc = NULL;
+ slapt_config_t *rc = NULL;
g_assert(SLAPT_IS_SERVICE(self));
*count = 0;
- rc = slapt_read_rc_config(SLAPT_SERVICE_DEFAULT_RC);
+ rc = slapt_config_t_read(SLAPT_SERVICE_DEFAULT_RC);
if ((chdir(rc->working_dir)) == -1)
goto SLAPT_SERVICE_REAL_CHECK_FOR_UPDATES_DONE;
@@ -90,19 +90,19 @@ SLAPT_SERVICE_REAL_CHECK_FOR_UPDATES_DONE:
if (tran != NULL)
slapt_free_transaction(tran);
if (rc != NULL)
- slapt_free_rc_config(rc);
+ slapt_config_t_free(rc);
return TRUE;
}
static gboolean slapt_service_real_refresh_cache(SlaptService *self)
{
- slapt_rc_config *rc = NULL;
+ slapt_config_t *rc = NULL;
int r = 0;
g_assert(SLAPT_IS_SERVICE(self));
- rc = slapt_read_rc_config(SLAPT_SERVICE_DEFAULT_RC);
+ rc = slapt_config_t_read(SLAPT_SERVICE_DEFAULT_RC);
if ((chdir(rc->working_dir)) == -1)
return FALSE;
@@ -110,7 +110,7 @@ static gboolean slapt_service_real_refresh_cache(SlaptService *self)
if (slapt_update_pkg_cache(rc) != 0)
fprintf(stderr, "failed to update package cache... handle me\n");
- slapt_free_rc_config(rc);
+ slapt_config_t_free(rc);
return TRUE;
}