From e24c22e308f3dfc0642a542ff2fd7158af489fd0 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Mar 2007 09:43:16 +0000 Subject: * A little more hacking with wchar_t output, but nothing really changed in it. Eventually we'll make progress. * Rewrote the _alpm_splitdep function to behave more like all our other function calls. Use heap instead of stack allocation for the depend struct, so now it needs to be freed by the caller. --- lib/libalpm/conflict.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/libalpm/conflict.c') diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index d8843bda..96c0ac84 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -47,14 +47,14 @@ #include "conflict.h" -/** See if potential conflict 'name' matches package 'pkg' +/** See if potential conflict 'name' matches package 'pkg'. * @param target the name of the parent package we're checking * @param depname the name of the dependency we're checking * @param pkg the package to check * @param conflict the name of the possible conflict * @return A depmissing struct indicating the conflict * @note The first two paramters are here to simplify the addition - * of new 'depmiss' objects + * of new 'depmiss' objects. * * TODO WTF is a 'depmissing' doing indicating a conflict?? */ -- cgit v1.2.3-54-g00ecf