poldek: poldek/install3/conflicts.c, poldek/install3/ictx.c, polde...
mis
mis at pld-linux.org
Wed Jan 30 23:13:47 CET 2008
Author: mis Date: Wed Jan 30 22:13:47 2008 GMT
Module: poldek Tag: HEAD
---- Log message:
- capreq_snprintf_s -> capreq_stra
---- Files affected:
poldek/poldek/install3:
conflicts.c (1.3 -> 1.4) , ictx.c (1.2 -> 1.3) , mark.c (1.3 -> 1.4) , misc.c (1.3 -> 1.4) , process.c (1.3 -> 1.4)
---- Diffs:
================================================================
Index: poldek/poldek/install3/conflicts.c
diff -u poldek/poldek/install3/conflicts.c:1.3 poldek/poldek/install3/conflicts.c:1.4
--- poldek/poldek/install3/conflicts.c:1.3 Wed Jan 30 22:29:34 2008
+++ poldek/poldek/install3/conflicts.c Wed Jan 30 23:13:42 2008
@@ -80,16 +80,16 @@
req = capreq_clone(NULL, cnfl);
#if 0 /* debug */
- printf("B %s -> ", capreq_snprintf_s(req));
+ printf("B %s -> ", capreq_stra(req));
capreq_revrel(req);
- printf("%s -> ", capreq_snprintf_s(req));
+ printf("%s -> ", capreq_stra(req));
capreq_revrel(req);
- printf("%s\n", capreq_snprintf_s(req));
+ printf("%s\n", capreq_stra(req));
#endif
- DBGF("find_req %s %s\n", pkg_id(pkg), capreq_snprintf_s(req));
+ DBGF("find_req %s %s\n", pkg_id(pkg), capreq_stra(req));
capreq_revrel(req);
- DBGF("find_req %s %s\n", pkg_id(pkg), capreq_snprintf_s(req));
+ DBGF("find_req %s %s\n", pkg_id(pkg), capreq_stra(req));
if (i3_is_user_choosable_equiv(ictx->ts))
candidates = pkgs_array_new(8);
@@ -154,7 +154,7 @@
return 0;
msgn_i(4, indent, "Processing conflict %s:%s...", pkg_id(pkg),
- capreq_snprintf_s(cnfl));
+ capreq_stra(cnfl));
if (ictx->ts->getop(ictx->ts, POLDEK_OP_ALLOWDUPS) &&
n_array_size(dbpkgs) > 1) {
@@ -169,7 +169,7 @@
if (!pkg_match_req(dbpkg, cnfl, 1)) {
msgn_i(5, indent, "%s: conflict disarmed by %s",
- capreq_snprintf_s(cnfl), pkg_id(dbpkg));
+ capreq_stra(cnfl), pkg_id(dbpkg));
n_hash_insert(ht, dbpkg->name, pkg);
}
}
@@ -179,7 +179,7 @@
struct pkg *dbpkg = n_array_nth(dbpkgs, i);
msg_i(6, indent, "%d. %s (%s) <-> %s ?\n", i, pkg_id(pkg),
- capreq_snprintf_s(cnfl), pkg_id(dbpkg));
+ capreq_stra(cnfl), pkg_id(dbpkg));
if (ht && n_hash_exists(ht, dbpkg->name))
continue;
@@ -191,10 +191,10 @@
if (!resolve_conflict(indent, ictx, pkg, cnfl, dbpkg)) {
i3_error(ictx, pkg, I3ERR_DBCONFLICT,
_("%s (cnfl %s) conflicts with installed %s"),
- pkg_id(pkg), capreq_snprintf_s(cnfl), pkg_id(dbpkg));
+ pkg_id(pkg), capreq_stra(cnfl), pkg_id(dbpkg));
logn(LOGERR, _("%s (cnfl %s) conflicts with installed %s"),
- pkg_id(pkg), capreq_snprintf_s(cnfl), pkg_id(dbpkg));
+ pkg_id(pkg), capreq_stra(cnfl), pkg_id(dbpkg));
ncnfl++;
}
}
@@ -226,7 +226,7 @@
struct pkg *dbpkg = n_array_nth(dbpkgs, i);
msg(6, "%s (%s) <-> %s ?\n", pkg_id(pkg),
- capreq_snprintf_s(cap), pkg_id(dbpkg));
+ capreq_stra(cap), pkg_id(dbpkg));
for (j = 0; j < n_array_size(dbpkg->cnfls); j++) {
struct capreq *cnfl = n_array_nth(dbpkg->cnfls, j);
@@ -236,8 +236,8 @@
i3_error(ictx, pkg, I3ERR_DBCONFLICT,
_("%s (cap %s) conflicts with installed %s (%s)"),
- pkg_id(pkg), capreq_snprintf_s(cap),
- pkg_id(dbpkg), capreq_snprintf_s0(cnfl));
+ pkg_id(pkg), capreq_stra(cap),
+ pkg_id(dbpkg), capreq_stra(cnfl));
ncnfl++;
}
}
@@ -282,7 +282,7 @@
if ((ictx->ps->flags & PSET_VRFY_MERCY) && capreq_is_bastard(cap))
continue;
- msg_i(3, indent, "cap %s\n", capreq_snprintf_s(cap));
+ msg_i(3, indent, "cap %s\n", capreq_stra(cap));
n = find_db_conflicts_dbcnfl_with_cap(indent, ictx, pkg, cap);
ncnfl += n;
}
@@ -295,7 +295,7 @@
if (capreq_is_obsl(cnfl))
continue;
- msg_i(3, indent, "cnfl %s\n", capreq_snprintf_s(cnfl));
+ msg_i(3, indent, "cnfl %s\n", capreq_stra(cnfl));
n = find_db_conflicts_cnfl_with_db(indent, ictx, pkg, cnfl);
ncnfl += n;
================================================================
Index: poldek/poldek/install3/ictx.c
diff -u poldek/poldek/install3/ictx.c:1.2 poldek/poldek/install3/ictx.c:1.3
--- poldek/poldek/install3/ictx.c:1.2 Wed Jan 30 22:29:35 2008
+++ poldek/poldek/install3/ictx.c Wed Jan 30 23:13:42 2008
@@ -170,8 +170,7 @@
void i3pkg_register_candidates(struct i3pkg *i3pkg, const struct capreq *req,
tn_array *candidates)
{
- char *strreq = NULL;
- capreq_stra(req, &strreq);
+ char *strreq = capreq_stra(req);
if (i3pkg->candidates == NULL)
i3pkg->candidates = n_hash_new(8, (tn_fn_free)n_array_free);
================================================================
Index: poldek/poldek/install3/mark.c
diff -u poldek/poldek/install3/mark.c:1.3 poldek/poldek/install3/mark.c:1.4
--- poldek/poldek/install3/mark.c:1.3 Wed Jan 30 22:29:35 2008
+++ poldek/poldek/install3/mark.c Wed Jan 30 23:13:42 2008
@@ -28,7 +28,7 @@
if (i < 0)
return 0;
- DBGF("%s, found (req is %s)\n", pkg_id(pkg), req ? capreq_snprintf_s(req) : "null");
+ DBGF("%s, found (req is %s)\n", pkg_id(pkg), req ? capreq_stra(req):"null");
for (; i < n_array_size(avpkgs); i++) {
struct pkg *p = n_array_nth(avpkgs, i);
@@ -39,7 +39,7 @@
if (req == NULL || pkg_satisfies_req(p, req, 0)) {
DBGF("%s -> YES, %s%s%s\n", pkg_id(pkg), pkg_id(p),
req ? " and satisfies " : "",
- req ? capreq_snprintf_s(req) : "null");
+ req ? capreq_stra(req) : "null");
return 1;
}
}
================================================================
Index: poldek/poldek/install3/misc.c
diff -u poldek/poldek/install3/misc.c:1.3 poldek/poldek/install3/misc.c:1.4
--- poldek/poldek/install3/misc.c:1.3 Wed Jan 30 22:25:25 2008
+++ poldek/poldek/install3/misc.c Wed Jan 30 23:13:42 2008
@@ -416,11 +416,11 @@
return found; /* do not trace rpmlib() caps */
if (candidates == NULL) {
- tracef(indent, "%s %s (best=%s)", capreq_snprintf_s(req),
+ tracef(indent, "%s %s (best=%s)", capreq_stra(req),
found ? "found" : "not found",
*best_pkg ? pkg_id(*best_pkg): "none");
} else {
- tracef(indent, "%s %s (%d candidate(s), best=%s)", capreq_snprintf_s(req),
+ tracef(indent, "%s %s (%d candidate(s), best=%s)", capreq_stra(req),
found ? "found" : "not found",
n_array_size(candidates),
*best_pkg ? pkg_id(*best_pkg): "none");
@@ -468,7 +468,7 @@
}
}
- n = poldek__choose_equiv(ts, capreq_snprintf_s(cap), pkgs, hint);
+ n = poldek__choose_equiv(ts, capreq_stra(cap), pkgs, hint);
if (n == -1)
return NULL;
================================================================
Index: poldek/poldek/install3/process.c
diff -u poldek/poldek/install3/process.c:1.3 poldek/poldek/install3/process.c:1.4
--- poldek/poldek/install3/process.c:1.3 Wed Jan 30 22:29:35 2008
+++ poldek/poldek/install3/process.c Wed Jan 30 23:13:42 2008
@@ -23,13 +23,13 @@
if (pkg_cmp_name(i3pkg->pkg, i3pkg->bypkg) != 0) {
msgn_i(1, indent, _("greedy upgrade %s to %s (unresolved %s)"),
pkg_id(i3pkg->bypkg), pkg_id(i3pkg->pkg),
- capreq_snprintf_s(i3pkg->byreq));
+ capreq_stra(i3pkg->byreq));
} else {
msgn_i(1, indent, _("greedy upgrade %s to %s-%s%s%s (unresolved %s)"),
pkg_id(i3pkg->bypkg), i3pkg->pkg->ver, i3pkg->pkg->rel,
poldek_conf_MULTILIB ? "." : "",
poldek_conf_MULTILIB ? pkg_arch(i3pkg->pkg) : "",
- capreq_snprintf_s(i3pkg->byreq));
+ capreq_stra(i3pkg->byreq));
}
} else {
@@ -42,8 +42,8 @@
prefix = _("orphaned ");
msgn_i(1, indent, _("%s%s marks %s (%s %s)"), prefix,
- pkg_id(i3pkg->bypkg), pkg_id(i3pkg->pkg),
- r, capreq_snprintf_s(i3pkg->byreq));
+ pkg_id(i3pkg->bypkg), pkg_id(i3pkg->pkg), r,
+ capreq_stra(i3pkg->byreq));
}
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/install3/conflicts.c?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/install3/ictx.c?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/install3/mark.c?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/install3/misc.c?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/install3/process.c?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list