commit 0bc4ba936db39ccf0466987d964a016363bceeee
Author: Richard Hughes <richard@hughsie.com>
Date: Wed Sep 10 15:17:01 2008 +0100
bugfix: don't convert null sections of a package_id to '(NULL)' instead use an empty string.
diff --git a/libpackagekit/pk-package-id.c b/libpackagekit/pk-package-id.c
index f328225..9d911fb 100644
--- a/libpackagekit/pk-package-id.c
+++ b/libpackagekit/pk-package-id.c
@@ -218,9 +214,12 @@ pk_package_id_copy (const PkPackageId *id)
gchar *
pk_package_id_to_string (const PkPackageId *id)
{
- return g_strdup_printf ("%s;%s;%s;%s",
- id->name, id->version,
- id->arch, id->data);
+ g_return_val_if_fail (id != NULL, NULL);
+ g_return_val_if_fail (id->name != NULL, NULL);
+ return g_strdup_printf ("%s;%s;%s;%s", id->name,
+ id->version != NULL ? id->version : "",
+ id->arch != NULL ? id->arch : "",
+ id->data != NULL ? id->data : "");
}
/**
@@ -237,11 +236,10 @@ pk_package_id_build (const gchar *name, const gchar *version,
const gchar *arch, const gchar *data)
{
g_return_val_if_fail (name != NULL, NULL);
- g_return_val_if_fail (version != NULL, NULL);
- g_return_val_if_fail (arch != NULL, NULL);
- g_return_val_if_fail (data != NULL, NULL);
-
- return g_strdup_printf ("%s;%s;%s;%s", name, version, arch, data);
+ return g_strdup_printf ("%s;%s;%s;%s", name,
+ version != NULL ? version : "",
+ arch != NULL ? arch : "",
+ data != NULL ? data : "");
}
/**