Attachment 7561 Details for Bug 8788 – Corrects the behaviour

[patch] Corrects the behaviour

private.diff (text/plain), 1.17 KB, created by Tom Parker on 2006-10-27 15:00:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Parker

Created: 2006-10-27 15:00:40 UTC

Size: 1.17 KB

patch

obsolete

>diff -rN -u old-pkg-config-0.21/pkg.c new-pkg-config-0.21/pkg.c
>--- old-pkg-config-0.21/pkg.c	2006-10-27 23:57:36.000000000 +0200
>+++ new-pkg-config-0.21/pkg.c	2006-10-27 23:57:36.000000000 +0200
>@@ -600,6 +600,11 @@
>   return g_slist_sort (list, pathposcmp);
> }
> 
>+static int compare_package(Package *a, Package *b)
>+{
>+	return strcmp(a->name,b->name);
>+}
>+
> static void
> fill_one_level (Package *pkg, GetListFunc func, GSList **listp)
> {
>@@ -672,6 +677,7 @@
> {
>   GSList *tmp;
>   GSList *expanded;
>+  GSList *tried = NULL;
> 
>   expanded = NULL;
>   tmp = packages;
>@@ -681,6 +687,22 @@
>       recursive_fill_list (tmp->data,
> 			   include_private ? get_requires_private : get_requires,
> 			   &expanded);
>+	  if (include_private)
>+	  {
>+	      tried = g_slist_append(tried, ((Package*)tmp->data)->name);
>+      	  GSList *extra;
>+		  extra = expanded;
>+		  while (extra!=NULL)
>+		  {
>+			Package *p = extra->data;
>+			if (g_slist_find_custom(tried,p->name,strcmp)==NULL && g_slist_find_custom(tmp,p,compare_package)==NULL)
>+			{
>+				//printf("package name = %s\n",p->name);
>+				tmp = g_slist_append(tmp,extra->data);
>+			}
>+			extra = extra->next;
>+		  }
>+	  }
> 
>       tmp = tmp->next;
>     }
>

Actions: View | Splinter Review

Attachments on bug 8788: 7561 | 9374

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.