diff options
| author | Michael Schroeder <mls@suse.de> | 2014-04-07 12:50:06 +0200 |
|---|---|---|
| committer | Michael Schroeder <mls@suse.de> | 2014-04-07 12:50:06 +0200 |
| commit | 657a22165436c4f0791c869ca953c55b43d55aee (patch) | |
| tree | 2d5268705c5354137affde715b8f7f51082a1f09 /tools/dumpsolv.c | |
| parent | 721f58c32a0d29fa6aa4f96c8a389d5cd09e5b04 (diff) | |
| download | libsolv-657a22165436c4f0791c869ca953c55b43d55aee.tar.gz libsolv-657a22165436c4f0791c869ca953c55b43d55aee.tar.bz2 libsolv-657a22165436c4f0791c869ca953c55b43d55aee.zip | |
simplyfy checksum code
Also change dumpsolv to use solv_chksum_type2str instead of printing
the internal type.
Diffstat (limited to 'tools/dumpsolv.c')
| -rw-r--r-- | tools/dumpsolv.c | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/tools/dumpsolv.c b/tools/dumpsolv.c index db2ce94..1aaee16 100644 --- a/tools/dumpsolv.c +++ b/tools/dumpsolv.c @@ -14,6 +14,7 @@ static int with_attr; static int dump_json; #include "pool.h" +#include "chksum.h" #include "repo_solv.h" @@ -50,14 +51,6 @@ dump_attr(Repo *repo, Repodata *data, Repokey *key, KeyValue *kv) case REPOKEY_TYPE_STR: printf("%s: %s\n", keyname, kv->str); break; - case REPOKEY_TYPE_MD5: - case REPOKEY_TYPE_SHA1: - case REPOKEY_TYPE_SHA224: - case REPOKEY_TYPE_SHA256: - case REPOKEY_TYPE_SHA384: - case REPOKEY_TYPE_SHA512: - printf("%s: %s (%s)\n", keyname, repodata_chk2str(data, key->type, (unsigned char *)kv->str), pool_id2str(repo->pool, key->type)); - break; case REPOKEY_TYPE_VOID: printf("%s: (void)\n", keyname); break; @@ -92,6 +85,11 @@ dump_attr(Repo *repo, Repodata *data, Repokey *key, KeyValue *kv) printf("\n"); break; default: + if (solv_chksum_len(key->type)) + { + printf("%s: %s (%s)\n", keyname, repodata_chk2str(data, key->type, (unsigned char *)kv->str), solv_chksum_type2str(key->type)); + break; + } printf("%s: ?\n", keyname); break; } @@ -224,17 +222,6 @@ dump_attr_json(Repo *repo, Repodata *data, Repokey *key, KeyValue *kv, struct cb str = kv->str; printf("%s", jsonstring(pool, str)); break; - case REPOKEY_TYPE_MD5: - case REPOKEY_TYPE_SHA1: - case REPOKEY_TYPE_SHA224: - case REPOKEY_TYPE_SHA256: - case REPOKEY_TYPE_SHA384: - case REPOKEY_TYPE_SHA512: - printf("{\n"); - printf("%*s \"value\": %s,\n", indent, "", jsonstring(pool, repodata_chk2str(data, key->type, (unsigned char *)kv->str))); - printf("%*s \"type\": %s\n", indent, "", jsonstring(pool, pool_id2str(repo->pool, key->type))); - printf("%*s}", indent, ""); - break; case REPOKEY_TYPE_VOID: printf("null"); break; @@ -276,6 +263,14 @@ dump_attr_json(Repo *repo, Repodata *data, Repokey *key, KeyValue *kv, struct cb printf("%*s]", indent, ""); break; default: + if (solv_chksum_len(key->type)) + { + printf("{\n"); + printf("%*s \"value\": %s,\n", indent, "", jsonstring(pool, repodata_chk2str(data, key->type, (unsigned char *)kv->str))); + printf("%*s \"type\": %s\n", indent, "", jsonstring(pool, solv_chksum_type2str(key->type))); + printf("%*s}", indent, ""); + break; + } printf("\"?\""); break; } |