Author: matz Date: Wed Jan 30 03:51:16 2008 New Revision: 8403 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8403&view=rev Log: Split repodata_insert_keyid from repodata_set to create repodata_merge_attrs. Modified: trunk/sat-solver/src/repodata.c trunk/sat-solver/src/repodata.h Modified: trunk/sat-solver/src/repodata.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repodata.c?rev=8403&r1=8402&r2=8403&view=diff ============================================================================== --- trunk/sat-solver/src/repodata.c (original) +++ trunk/sat-solver/src/repodata.c Wed Jan 30 03:51:16 2008 @@ -513,11 +513,38 @@ } } +static void +repodata_insert_keyid(Repodata *data, Id entry, Id keyid, Id val, int overwrite) +{ + Id *pp; + int i; + if (!data->attrs) + data->attrs = sat_calloc(data->end - data->start + 1, sizeof(Id *)); + i = 0; + if (data->attrs[entry]) + { + for (pp = data->attrs[entry]; *pp; pp += 2) + if (*pp == keyid) + break; + if (*pp) + { + if (overwrite) + pp[1] = val; + return; + } + i = pp - data->attrs[entry]; + } + data->attrs[entry] = sat_realloc2(data->attrs[entry], i + 3, sizeof(Id)); + pp = data->attrs[entry] + i; + *pp++ = keyid; + *pp++ = val; + *pp = 0; +} + void repodata_set(Repodata *data, Id entry, Repokey *key, Id val) { - Id keyid, *pp; - int i; + Id keyid; /* find key in keys */ for (keyid = 1; keyid < data->nkeys; keyid++) @@ -538,27 +565,7 @@ data->verticaloffset[data->nkeys - 1] = 0; } } - key = data->keys + keyid; - if (!data->attrs) - data->attrs = sat_calloc(data->end - data->start + 1, sizeof(Id *)); - i = 0; - if (data->attrs[entry]) - { - for (pp = data->attrs[entry]; *pp; pp += 2) - if (*pp == keyid) - break; - if (*pp) - { - pp[1] = val; - return; - } - i = pp - data->attrs[entry]; - } - data->attrs[entry] = sat_realloc2(data->attrs[entry], i + 3, sizeof(Id)); - pp = data->attrs[entry] + i; - *pp++ = keyid; - *pp++ = val; - *pp = 0; + repodata_insert_keyid(data, entry, keyid, val, 1); } void @@ -647,7 +654,7 @@ #if 0 fprintf(stderr, "repodata_add_dirnumnum %d %d %d %d (%d)\n", entry, dir, num, num2, data->attriddatalen); #endif - if (data->attrs[entry]) + if (data->attrs && data->attrs[entry]) { for (pp = data->attrs[entry]; *pp; pp += 2) if (data->keys[*pp].name == keyname && data->keys[*pp].type == TYPE_DIRNUMNUMARRAY) @@ -690,6 +697,14 @@ data->attriddata[data->attriddatalen++] = 0; } +void +repodata_merge_attrs (Repodata *data, Id dest, Id src) +{ + Id *keyp; + for (keyp = data->attrs[src]; *keyp; keyp += 2) + repodata_insert_keyid(data, dest, keyp[0], keyp[1], 0); +} + /*********************************/ /* unify with repo_write! */ @@ -851,15 +866,16 @@ *sp++ = *keyp; oldcount++; } - for (keyp = data->attrs[entry]; *keyp; keyp += 2) - { - if (!seen[*keyp]) - { - newschema = 1; - *sp++ = *keyp; - } - seen[*keyp] = keyp[1] + 1; - } + if (data->attrs[entry]) + for (keyp = data->attrs[entry]; *keyp; keyp += 2) + { + if (!seen[*keyp]) + { + newschema = 1; + *sp++ = *keyp; + } + seen[*keyp] = keyp[1] + 1; + } *sp++ = 0; if (newschema) /* Ideally we'd like to sort the new schema here, to ensure Modified: trunk/sat-solver/src/repodata.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repodata.h?rev=8403&r1=8402&r2=8403&view=diff ============================================================================== --- trunk/sat-solver/src/repodata.h (original) +++ trunk/sat-solver/src/repodata.h Wed Jan 30 03:51:16 2008 @@ -111,6 +111,7 @@ void repodata_set_void(Repodata *data, Id entry, Id keyname); void repodata_set_str(Repodata *data, Id entry, Id keyname, const char *str); void repodata_add_dirnumnum(Repodata *data, Id entry, Id keyname, Id dir, Id num, Id num2); +void repodata_merge_attrs (Repodata *data, Id dest, Id src); void repodata_internalize(Repodata *data); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org