summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTollef Fog Heen <tfheen@err.no>2011-05-15 11:05:42 +0200
committerTollef Fog Heen <tfheen@err.no>2011-05-15 11:05:42 +0200
commit7c45ef3c8480df40fd7b943b2dc9a165af98e71b (patch)
treeaac418312c3be2a4405dac46c7854a2e6d1a7332
parent13636214674abf39a338532fd483674ff3a20bff (diff)
Drop dead code
-rw-r--r--main.c5
-rw-r--r--parse.c53
-rw-r--r--pkg.c51
3 files changed, 0 insertions, 109 deletions
diff --git a/main.c b/main.c
index 8fd56ed..95ce69d 100644
--- a/main.c
+++ b/main.c
@@ -203,13 +203,9 @@ main (int argc, char **argv)
GSList *packages = NULL;
char *search_path;
char *pcbuilddir;
- const char *pkglibdir;
- char **search_dirs;
- char **iter;
gboolean need_newline;
FILE *log = NULL;
const char *pkgname;
- Package *pkg;
poptContext opt_context;
@@ -531,7 +527,6 @@ main (int argc, char **argv)
if (want_variable_list)
{
GSList *tmp;
- gchar *str;
tmp = packages;
while (tmp != NULL)
{
diff --git a/parse.c b/parse.c
index be455cd..e28cbd2 100644
--- a/parse.c
+++ b/parse.c
@@ -617,8 +617,6 @@ parse_requires_private (Package *pkg, const char *str, const char *path)
static void
parse_conflicts (Package *pkg, const char *str, const char *path)
{
- GSList *parsed;
- GSList *iter;
char *trimmed;
if (pkg->conflicts)
@@ -1178,54 +1176,3 @@ parse_package_file (const char *path, gboolean ignore_requires,
return pkg;
}
-
-static char *
-backticks (const char *command)
-{
- FILE *f;
- char buf[4096];
- size_t len;
- int status;
-
- f = popen (command, "r");
-
- if (f == NULL)
- return NULL;
-
- len = fread (buf, 1, 4090, f);
-
- if (ferror (f))
- {
- pclose (f);
- return NULL;
- }
-
- buf[len] = '\0';
-
- status = pclose (f);
-
- return g_strdup (buf);
-}
-
-static gboolean
-try_command (const char *command)
-{
- int status;
- char *munged;
-
-#ifdef G_OS_WIN32
- munged = g_strdup_printf ("%s > NUL", command);
-#else
- munged = g_strdup_printf ("%s > /dev/null 2>&1", command);
-#endif
-
- status = system (munged);
-
- g_free (munged);
-
-#ifdef G_OS_WIN32
- return status == 0;
-#else
- return WIFEXITED(status) && (WEXITSTATUS(status) == 0);
-#endif
-}
diff --git a/pkg.c b/pkg.c
index 9ce31b2..6834dfa 100644
--- a/pkg.c
+++ b/pkg.c
@@ -263,21 +263,6 @@ package_init ()
}
}
-static gboolean
-file_readable (const char *path)
-{
- FILE *f = fopen (path, "r");
-
- if (f != NULL)
- {
- fclose (f);
- return TRUE;
- }
- else
- return FALSE;
-}
-
-
static Package *
internal_get_package (const char *name, gboolean warn)
{
@@ -571,22 +556,6 @@ spew_package_list (const char *name,
debug_spew ("\n");
}
-static void
-spew_string_list (const char *name,
- GSList *list)
-{
- GSList *tmp;
-
- debug_spew (" %s: ", name);
-
- tmp = list;
- while (tmp != NULL)
- {
- debug_spew (" %s ", tmp->data);
- tmp = tmp->next;
- }
- debug_spew ("\n");
-}
static GSList*
packages_sort_by_path_position (GSList *list)
@@ -699,24 +668,6 @@ fill_list (GSList *packages, GetListFunc func,
g_slist_free (expanded);
}
-static gint
-compare_req_version_names (gconstpointer a, gconstpointer b)
-{
- const RequiredVersion *ver_a = a;
- const RequiredVersion *ver_b = b;
-
- return strcmp (ver_a->name, ver_b->name);
-}
-
-static gint
-compare_package_keys (gconstpointer a, gconstpointer b)
-{
- const Package *pkg_a = a;
- const Package *pkg_b = b;
-
- return strcmp (pkg_a->key, pkg_b->key);
-}
-
static GSList *
add_env_variable_to_list (GSList *list, const gchar *env)
{
@@ -1030,7 +981,6 @@ static char*
get_multi_merged (GSList *pkgs, GetListFunc func, gboolean in_path_order,
gboolean include_private)
{
- GSList *tmp;
GSList *dups_list = NULL;
GSList *list;
char *retval;
@@ -1052,7 +1002,6 @@ static char*
get_multi_merged_from_back (GSList *pkgs, GetListFunc func,
gboolean in_path_order, gboolean include_private)
{
- GSList *tmp;
GSList *dups_list = NULL;
GSList *list;
char *retval;