From: Michael Tremer Date: Thu, 18 Jan 2018 18:50:28 +0000 (+0100) Subject: libpakfire: Drop pakfire_pool_tmpdup X-Git-Tag: 0.9.28~1285^2~1167 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=464c8ecc5acacd56730b35b492ba5f6d343ae107;p=pakfire.git libpakfire: Drop pakfire_pool_tmpdup Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/include/pakfire/pool.h b/src/libpakfire/include/pakfire/pool.h index 799e37c7b..6e34f873f 100644 --- a/src/libpakfire/include/pakfire/pool.h +++ b/src/libpakfire/include/pakfire/pool.h @@ -37,7 +37,6 @@ PakfireCache pakfire_pool_get_cache(PakfirePool pool); #include Pool* pakfire_pool_get_solv_pool(PakfirePool pool); -char* pakfire_pool_tmpdup(Pool* pool, const char* s); #endif diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c index 5d8f41ade..363418862 100644 --- a/src/libpakfire/package.c +++ b/src/libpakfire/package.c @@ -238,9 +238,11 @@ PAKFIRE_EXPORT void pakfire_package_set_evr(PakfirePackage pkg, const char* evr) } static void split_evr(Pool* pool, const char* evr_c, char** epoch, char** version, char** release) { - char* evr = pakfire_pool_tmpdup(pool, evr_c); char *e, *v, *r; + char* evr = pool_alloctmpspace(pool, strlen(evr_c) + 1); + strcpy(evr, evr_c); + for (e = evr + 1; *e != ':' && *e != '-'; ++e) ; diff --git a/src/libpakfire/pool.c b/src/libpakfire/pool.c index 3fa20bc11..4e78f3bd1 100644 --- a/src/libpakfire/pool.c +++ b/src/libpakfire/pool.c @@ -103,9 +103,3 @@ PAKFIRE_EXPORT PakfireCache pakfire_pool_get_cache(PakfirePool pool) { return NULL; } - -PAKFIRE_EXPORT char* pakfire_pool_tmpdup(Pool* pool, const char* s) { - char* dup = pool_alloctmpspace(pool, strlen(s) + 1); - - return strcpy(dup, s); -}