This was blocked due to some line # changes in the po files... so it got real messy, even though this was a small commit. Date: Tuesday, February 13, 2007 @ 03:15:39 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/alpm_list.h (1.3 -> 1.4) lib/libalpm/conflict.c (1.34 -> 1.35) lib/libalpm/package.c (1.67 -> 1.68) lib/libalpm/po/de.po (1.2 -> 1.3) lib/libalpm/po/fr.po (1.2 -> 1.3) lib/libalpm/po/hu.po (1.2 -> 1.3) lib/libalpm/po/it.po (1.1 -> 1.2) lib/libalpm/po/pt_BR.po (1.1 -> 1.2) lib/libalpm/remove.c (1.62 -> 1.63) lib/libalpm/sync.c (1.100 -> 1.101) lib/libalpm/util.c (1.44 -> 1.45) lib/libalpm/util.h (1.20 -> 1.21) src/pacman/po/de.po (1.2 -> 1.3) src/pacman/po/fr.po (1.2 -> 1.3) src/pacman/po/hu.po (1.2 -> 1.3) src/pacman/po/it.po (1.1 -> 1.2) src/pacman/po/pt_BR.po (1.1 -> 1.2) * Refactored conflict checking within packages. Profiling from Dan showed an unbelievable amount of strcmp() calls (25 million) due to the list searching. This has been reimplemented with a set-intersection scheme, due to the fact that file lists are always ordered. - NEEDS TESTING * Minor clean up, "globalized" the str_cmp helper to match the alpm comparison signature, so we can use it elsewhere. -------------------------+ lib/libalpm/alpm_list.h | 6 lib/libalpm/conflict.c | 72 ++++-- lib/libalpm/package.c | 4 lib/libalpm/po/de.po | 475 ++++++++++++++++++++++++--------------------- lib/libalpm/po/fr.po | 477 ++++++++++++++++++++++++--------------------- lib/libalpm/po/hu.po | 482 ++++++++++++++++++++++++---------------------- lib/libalpm/po/it.po | 460 +++++++++++++++++++++++-------------------- lib/libalpm/po/pt_BR.po | 460 +++++++++++++++++++++++-------------------- lib/libalpm/remove.c | 10 lib/libalpm/sync.c | 2 lib/libalpm/util.c | 8 lib/libalpm/util.h | 2 src/pacman/po/de.po | 427 +++++++++++++++++++++------------------- src/pacman/po/fr.po | 416 ++++++++++++++++++++------------------- src/pacman/po/hu.po | 428 +++++++++++++++++++++------------------- src/pacman/po/it.po | 345 +++++++++++++++++--------------- src/pacman/po/pt_BR.po | 345 +++++++++++++++++--------------- 17 files changed, 2345 insertions(+), 2074 deletions(-)