emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-dgraph: remove code to colorize optional objs (unmaintanable).

Browse Source
This commit is contained in:
Juan RP 2014-11-20 10:48:28 +01:00
parent 1bae26606e
commit 2e3213de25
1 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bin/xbps-dgraph/main.c
View File

@ -44,15 +44,6 @@
#define _DGRAPH_CFFILE "xbps-dgraph.conf" #define _DGRAPH_CFFILE "xbps-dgraph.conf"
/*
* Object key for optional objects in package dictionary.
*/
static const char *optional_objs[] = {
"conflicts", "provides", "replaces", "run_depends", "preserve",
"homepage", "license", "packaged_with", "build_options",
"install_script", "remove_script", "long_desc", "requiredby"
};
/* /*
* Properties written to default configuration file. * Properties written to default configuration file.
*/ */
@ -252,39 +243,24 @@ parse_array_in_pkg_dictionary(FILE *f, xbps_dictionary_t plistd,
{ {
xbps_dictionary_keysym_t dksym; xbps_dictionary_keysym_t dksym;
xbps_object_t keyobj, sub_keyobj; xbps_object_t keyobj, sub_keyobj;
const char *tmpkeyname, *cfprop, *optnodetmp; const char *tmpkeyname, *cfprop;
char *optnode, *keyname; char *keyname;
for (unsigned int i = 0; i < xbps_array_count(allkeys); i++) { for (unsigned int i = 0; i < xbps_array_count(allkeys); i++) {
dksym = xbps_array_get(allkeys, i); dksym = xbps_array_get(allkeys, i);
tmpkeyname = xbps_dictionary_keysym_cstring_nocopy(dksym); tmpkeyname = xbps_dictionary_keysym_cstring_nocopy(dksym);
keyobj = xbps_dictionary_get_keysym(plistd, dksym); keyobj = xbps_dictionary_get_keysym(plistd, dksym);
keyname = strip_dashes_from_key(tmpkeyname); keyname = strip_dashes_from_key(tmpkeyname);
optnode = NULL;
fprintf(f, " main -> %s [label=\"%s\"];\n", fprintf(f, " main -> %s [label=\"%s\"];\n",
keyname, convert_proptype_to_string(keyobj)); keyname, convert_proptype_to_string(keyobj));
xbps_dictionary_get_cstring_nocopy(sub_confd, "opt-style", &cfprop); xbps_dictionary_get_cstring_nocopy(sub_confd, "opt-style", &cfprop);
/* Check if object is optional and fill it in */
for (unsigned int x = 0; x < __arraycount(optional_objs); x++) {
if (strcmp(keyname, optional_objs[x]) == 0) {
optnode = xbps_xasprintf("[style=\"%s\"",
cfprop);
break;
}
}
optnodetmp = optnode;
/* /*
* Process array objects. * Process array objects.
*/ */
xbps_dictionary_get_cstring_nocopy(sub_confd, "style", &cfprop); xbps_dictionary_get_cstring_nocopy(sub_confd, "style", &cfprop);
if (xbps_object_type(keyobj) == XBPS_TYPE_ARRAY) { if (xbps_object_type(keyobj) == XBPS_TYPE_ARRAY) {
if (optnodetmp)
fprintf(f, " %s %s];\n", keyname,
optnodetmp);
for (unsigned int x = 0; x < xbps_array_count(keyobj); x++) { for (unsigned int x = 0; x < xbps_array_count(keyobj); x++) {
sub_keyobj = xbps_array_get(keyobj, x); sub_keyobj = xbps_array_get(keyobj, x);
if (xbps_object_type(sub_keyobj) == XBPS_TYPE_STRING) { if (xbps_object_type(sub_keyobj) == XBPS_TYPE_STRING) {
@ -305,19 +281,10 @@ parse_array_in_pkg_dictionary(FILE *f, xbps_dictionary_t plistd,
xbps_string_cstring_nocopy(sub_keyobj)); xbps_string_cstring_nocopy(sub_keyobj));
} }
} }
if (optnode)
free(optnode);
free(keyname); free(keyname);
continue; continue;
} }
fprintf(f, " %s -> %s_value;\n", keyname, keyname);
if (optnodetmp) {
fprintf(f, " %s %s];\n", keyname, optnodetmp);
fprintf(f, " %s -> %s_value %s];\n", keyname, keyname,
optnode);
} else
fprintf(f, " %s -> %s_value;\n", keyname, keyname);
xbps_dictionary_get_cstring_nocopy(sub_confd, "style", &cfprop); xbps_dictionary_get_cstring_nocopy(sub_confd, "style", &cfprop);
fprintf(f, " %s_value [style=\"%s\",", keyname, cfprop); fprintf(f, " %s_value [style=\"%s\",", keyname, cfprop);
xbps_dictionary_get_cstring_nocopy(sub_confd, xbps_dictionary_get_cstring_nocopy(sub_confd,
@ -354,10 +321,7 @@ parse_array_in_pkg_dictionary(FILE *f, xbps_dictionary_t plistd,
break; break;
} }
fprintf(f, "];\n"); fprintf(f, "];\n");
free(keyname); free(keyname);
if (optnode)
free(optnode);
} }
} }