After changing types and function names to all have the "alpm" prefix, I assume we also want to do that for the members of our enums. That appears to be the last big change needed for consistent prefixing throughout libalpm. These patches are all available on my ALPM branch. @Dan: Assuming this is fine, I can send you a script that generates this patchset to allow you to "merge" this branch whenever you deem suitable. That should save rebasing time. Allan McRae (9): Prefix alpm_pkgreason_t members with ALPM Prefix alpm_depmod_t members with ALPM Prefix alpm_fileconflicttype_t members with ALPM Prefix alpm_loglevel_t members with ALPM Prefix alpm_transflag_t members with ALPM Prefix alpm_transevt_t members with ALPM Prefix alpm_transconv_t members with ALPM Prefix alpm_transprog_t members with ALPM Prefix _alpm_errno_t members with ALPM lib/libalpm/add.c | 166 +++++++++++++++--------------- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 248 +++++++++++++++++++++++----------------------- lib/libalpm/be_local.c | 60 ++++++------ lib/libalpm/be_package.c | 58 ++++++------ lib/libalpm/be_sync.c | 66 ++++++------ lib/libalpm/conflict.c | 42 ++++---- lib/libalpm/db.c | 70 +++++++------- lib/libalpm/delta.c | 4 +- lib/libalpm/deps.c | 94 +++++++++--------- lib/libalpm/diskspace.c | 40 ++++---- lib/libalpm/dload.c | 30 +++--- lib/libalpm/error.c | 102 ++++++++++---------- lib/libalpm/handle.c | 30 +++--- lib/libalpm/log.c | 6 +- lib/libalpm/package.c | 4 +- lib/libalpm/remove.c | 120 +++++++++++----------- lib/libalpm/signing.c | 56 +++++----- lib/libalpm/sync.c | 174 ++++++++++++++++---------------- lib/libalpm/trans.c | 54 +++++----- lib/libalpm/util.c | 56 +++++----- lib/libalpm/util.h | 4 +- src/pacman/callback.c | 80 ++++++++-------- src/pacman/conf.c | 110 ++++++++++---------- src/pacman/database.c | 16 ++-- src/pacman/package.c | 8 +- src/pacman/pacman.c | 66 ++++++------ src/pacman/query.c | 32 +++--- src/pacman/remove.c | 18 ++-- src/pacman/sync.c | 70 +++++++------- src/pacman/upgrade.c | 28 +++--- src/pacman/util.c | 28 +++--- src/util/cleanupdelta.c | 6 +- src/util/testdb.c | 4 +- src/util/testpkg.c | 10 +- 35 files changed, 981 insertions(+), 981 deletions(-) -- 1.7.6