Author: mlschroe Date: Fri Feb 15 20:01:09 2008 New Revision: 8760 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8760&view=rev Log: - add static noise - add id_filelist - dump DIRSTRARRAY type Modified: trunk/sat-solver/tools/dumpsolv.c trunk/sat-solver/tools/repo_write.c trunk/sat-solver/tools/tools_util.h Modified: trunk/sat-solver/tools/dumpsolv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/dumpsolv.c?rev=8760&r1=8759&r2=8760&view=diff ============================================================================== --- trunk/sat-solver/tools/dumpsolv.c (original) +++ trunk/sat-solver/tools/dumpsolv.c Fri Feb 15 20:01:09 2008 @@ -169,6 +169,11 @@ printdir(data, kv->id); printf(" %d %d\n", kv->num, kv->num2); break; + case TYPE_DIRSTRARRAY: + printf("%s: ", keyname); + printdir(data, kv->id); + printf("/%s\n", kv->str); + break; default: printf("%s: ?\n", keyname); break; Modified: trunk/sat-solver/tools/repo_write.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_write.c?rev=8760&r1=8759&r2=8760&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_write.c (original) +++ trunk/sat-solver/tools/repo_write.c Fri Feb 15 20:01:09 2008 @@ -398,7 +398,7 @@ #define SCHEMATADATA_BLOCK 255 #define EXTDATA_BLOCK 1023 -void +static void data_addid(struct extdata *xd, Id x) { unsigned char *dp; @@ -419,7 +419,7 @@ xd->len = dp - xd->buf; } -void +static void data_addideof(struct extdata *xd, Id x, int eof) { if (x >= 64) @@ -427,7 +427,7 @@ data_addid(xd, (eof ? x: x | 64)); } -void +static void data_addblob(struct extdata *xd, unsigned char *blob, int len) { xd->buf = sat_extend(xd->buf, xd->len, len, 1, EXTDATA_BLOCK); @@ -494,7 +494,7 @@ return id; } -Id +static Id putinowndirpool(struct cbdata *cbdata, Repodata *data, Dirpool *dp, Id dir) { Id compid, parent; @@ -528,7 +528,7 @@ cbdata->dirused[0] = 2; } -int +static int repo_write_cb_needed(void *vcbdata, Solvable *s, Repodata *data, Repokey *key, KeyValue *kv) { struct cbdata *cbdata = vcbdata; @@ -555,6 +555,7 @@ break; case TYPE_DIR: case TYPE_DIRNUMNUMARRAY: + case TYPE_DIRSTRARRAY: id = kv->id; if (cbdata->owndirpool) putinowndirpool(cbdata, data, &data->dirpool, id); @@ -567,7 +568,7 @@ return 0; } -int +static int repo_write_cb_sizes(void *vcbdata, Solvable *s, Repodata *data, Repokey *key, KeyValue *kv) { struct cbdata *cbdata = vcbdata; @@ -901,7 +902,7 @@ repodataused[i] = 1; if (key->type != TYPE_STR && key->type != TYPE_U32) idused = 1; - if (key->type == TYPE_DIR || key->type == TYPE_DIRNUMNUMARRAY) + if (key->type == TYPE_DIR || key->type == TYPE_DIRNUMNUMARRAY || key->type == TYPE_DIRSTRARRAY) dirused = 1; } if (idused) Modified: trunk/sat-solver/tools/tools_util.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tools_util.h?rev=8760&r1=8759&r2=8760&view=diff ============================================================================== --- trunk/sat-solver/tools/tools_util.h (original) +++ trunk/sat-solver/tools/tools_util.h Fri Feb 15 20:01:09 2008 @@ -154,6 +154,7 @@ static Id id_source; static Id id_sourceid; static Id id_time; +static Id id_filelist; /* resobject */ static Id id_summary; @@ -200,6 +201,7 @@ id_source = str2id(pool, "source", 1); id_sourceid = str2id(pool, "sourceid", 1); id_time = str2id(pool, "time", 1); + id_filelist = str2id(pool, "filelist", 1); id_isvisible = str2id(pool, "isvisible", 1); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org