Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4fc41074a7982d9a212917f29df55602ecf65b69
commit 4fc41074a7982d9a212917f29df55602ecf65b69 Author: Michel Hermier <[email protected]> Date: Wed May 7 11:52:52 2014 +0200 libpacman: Remove some FREE usage where possible. diff --git a/lib/libpacman/db/fakedb.cpp b/lib/libpacman/db/fakedb.cpp index 9a3b85a..b369594 100644 --- a/lib/libpacman/db/fakedb.cpp +++ b/lib/libpacman/db/fakedb.cpp @@ -73,7 +73,7 @@ static Package *_pacman_fakedb_pkg_new(pmdb_t *fakedb, const char *name) _pacman_log(PM_LOG_ERROR, _("could not parse token %s"), p); } } - FREE(str); + free(str); if(dummy->m_name[0] == 0 || dummy->m_version[0] == 0) { delete dummy; RET_ERR(PM_ERR_PKG_INVALID_NAME, NULL); diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 84a14b2..0596f8a 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -58,7 +58,7 @@ static void _pacman_graph_free(void *data) { pmgraph_t *graph = data; FREELISTPTR(graph->children); - FREE(graph); + free(graph); } pmdepmissing_t *_pacman_depmiss_new(const char *target, unsigned char type, unsigned char depmod, @@ -303,7 +303,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag case PM_DEP_MOD_LT: found = (cmp < 0); break; case PM_DEP_MOD_GT: found = (cmp > 0); break; } - FREE(ver); + free(ver); } } } @@ -350,7 +350,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag case PM_DEP_MOD_LT: found = (cmp < 0); break; case PM_DEP_MOD_GT: found = (cmp > 0); break; } - FREE(ver); + free(ver); } } FREELISTPTR(k); @@ -383,7 +383,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag case PM_DEP_MOD_LT: found = (cmp < 0); break; case PM_DEP_MOD_GT: found = (cmp > 0); break; } - FREE(ver); + free(ver); } } } @@ -476,8 +476,7 @@ int _pacman_splitdep(char *depstr, pmdepend_t *depend) } if(ptr == NULL) { - FREE(str); - return(0); + goto out; } *ptr = '\0'; STRNCPY(depend->name, str, PKG_NAME_LEN); @@ -486,8 +485,9 @@ int _pacman_splitdep(char *depstr, pmdepend_t *depend) ptr++; } STRNCPY(depend->version, ptr, PKG_VERSION_LEN); - FREE(str); +out: + free(str); return(0); } diff --git a/lib/libpacman/handle.cpp b/lib/libpacman/handle.cpp index bec817f..312eb4c 100644 --- a/lib/libpacman/handle.cpp +++ b/lib/libpacman/handle.cpp @@ -97,14 +97,14 @@ Handle::~Handle() /* free memory */ delete trans; - FREE(root); - FREE(dbpath); - FREE(cachedir); - FREE(hooksdir); - FREE(language); - FREE(logfile); - FREE(proxyhost); - FREE(xfercommand); + free(root); + free(dbpath); + free(cachedir); + free(hooksdir); + free(language); + free(logfile); + free(proxyhost); + free(xfercommand); FREELIST(dbs_sync); FREELIST(noupgrade); FREELIST(noextract); diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index f85648c..6de17a8 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -213,7 +213,7 @@ Package *_pacman_fpmpackage_load(const char *pkgfile) f_strtrim(str); info->m_files = _pacman_stringlist_append(info->m_files, str); } - FREE(str); + free(str); fclose(filelist); continue; } else { diff --git a/lib/libpacman/server.cpp b/lib/libpacman/server.cpp index 1fa03d8..fbe1b6f 100644 --- a/lib/libpacman/server.cpp +++ b/lib/libpacman/server.cpp @@ -118,9 +118,9 @@ void _pacman_server_free(void *data) } /* free memory */ - FREE(server->protocol); - FREE(server->server); - FREE(server->path); + free(server->protocol); + free(server->server); + free(server->path); free(server); } diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index fcb33a4..a9c9770 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -853,13 +853,13 @@ int _pacman_fpmpackage_install(Package *pkg, pmtranstype_t type, pmtrans_t *tran } } - FREE(md5_local); - FREE(md5_pkg); - FREE(sha1_local); - FREE(sha1_pkg); - FREE(hash_orig); + free(md5_local); + free(md5_pkg); + free(sha1_local); + free(sha1_pkg); + free(hash_orig); unlink(temp); - FREE(temp); + free(temp); close(fd); } else { if(!notouch) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
