From 94e6506e498c3aaf06f89235198a789af4156229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=98yvind=20Karlsen?= Date: Wed, 13 Oct 2010 23:35:04 +0000 Subject: use rpmsenseFlags typedef --- URPM.xs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/URPM.xs b/URPM.xs index 1b17ba2..4d7b7a8 100644 --- a/URPM.xs +++ b/URPM.xs @@ -312,7 +312,7 @@ sigsize_to_filesize(int sigsize) { } static int -print_list_entry(char *buff, int sz, const char *name, uint32_t flags, const char *evr) { +print_list_entry(char *buff, int sz, const char *name, rpmsenseFlags flags, const char *evr) { int len = strlen(name); char *p = buff; @@ -343,7 +343,7 @@ print_list_entry(char *buff, int sz, const char *name, uint32_t flags, const cha } static int -ranges_overlap(uint32_t aflags, char *sa, uint32_t bflags, char *sb) { +ranges_overlap(rpmsenseFlags aflags, char *sa, rpmsenseFlags bflags, char *sb) { if (!aflags || !bflags) return 1; /* really faster to test it there instead of later */ else { @@ -375,10 +375,10 @@ rpmsenseFlags is_not_old_suggests(rpmsenseFlags flags) { return !is_old_suggests(flags); } -typedef int (*callback_list_str)(char *s, int slen, const char *name, const uint32_t flags, const char *evr, void *param); +typedef int (*callback_list_str)(char *s, int slen, const char *name, const rpmsenseFlags flags, const char *evr, void *param); static int -callback_list_str_xpush(char *s, int slen, const char *name, uint32_t flags, const char *evr, __attribute__((unused)) void *param) { +callback_list_str_xpush(char *s, int slen, const char *name, rpmsenseFlags flags, const char *evr, __attribute__((unused)) void *param) { dSP; if (s) { XPUSHs(sv_2mortal(newSVpv(s, slen))); @@ -393,7 +393,7 @@ callback_list_str_xpush(char *s, int slen, const char *name, uint32_t flags, con return 0; } static int -callback_list_str_xpush_requires(char *s, int slen, const char *name, const uint32_t flags, const char *evr, __attribute__((unused)) void *param) { +callback_list_str_xpush_requires(char *s, int slen, const char *name, const rpmsenseFlags flags, const char *evr, __attribute__((unused)) void *param) { dSP; if (s) { XPUSHs(sv_2mortal(newSVpv(s, slen))); @@ -408,7 +408,7 @@ callback_list_str_xpush_requires(char *s, int slen, const char *name, const uint return 0; } static int -callback_list_str_xpush_old_suggests(char *s, int slen, const char *name, uint32_t flags, const char *evr, __attribute__((unused)) void *param) { +callback_list_str_xpush_old_suggests(char *s, int slen, const char *name, rpmsenseFlags flags, const char *evr, __attribute__((unused)) void *param) { dSP; if (s) { XPUSHs(sv_2mortal(newSVpv(s, slen))); @@ -425,13 +425,13 @@ callback_list_str_xpush_old_suggests(char *s, int slen, const char *name, uint32 struct cb_overlap_s { char *name; - int32_t flags; + rpmsenseFlags flags; char *evr; int direction; /* indicate to compare the above at left or right to the iteration element */ }; static int -callback_list_str_overlap(char *s, int slen, const char *name, uint32_t flags, const char *evr, void *param) { +callback_list_str_overlap(char *s, int slen, const char *name, rpmsenseFlags flags, const char *evr, void *param) { struct cb_overlap_s *os = (struct cb_overlap_s *)param; int result = 0; char *eos = NULL; @@ -524,7 +524,7 @@ return_list_str(char *s, Header header, rpmTag tag_name, rpmTag tag_flags, rpmTa } for (list->ix = 0; list->ix < (int)list->c; list->ix++) { ++count; - uint32_t *flag = (list->ix < (int)flags->c) ? flags->p.ui32p : NULL; + rpmsenseFlags *flag = (list->ix < (int)flags->c) ? (rpmsenseFlags*)flags->p.ui32p : NULL; if (f(NULL, 0, list->p.argv[list->ix], flag ? flag[list->ix] : 0, (list_evr->ix < (int)list_evr->c) ? list_evr->p.argv[list->ix] : NULL, param)) { @@ -758,7 +758,7 @@ return_files(Header header, int filter_mode) { const char *s; STRLEN len; - uint32_t *flags = NULL; + rpmsenseFlags *flags = NULL; uint16_t *fmodes = NULL; if (filter_mode) { HE_t he_flags = memset(alloca(sizeof(*he_flags)), 0, sizeof(*he_flags)); @@ -768,7 +768,7 @@ return_files(Header header, int filter_mode) { he_fmodes->tag = RPMTAG_FILEMODES; headerGet(header, he_flags, 0); headerGet(header, he_fmodes, 0); - flags = he_flags->p.ui32p; + flags = (rpmsenseFlags*)he_flags->p.ui32p; fmodes = he_fmodes->p.ui16p; } @@ -891,7 +891,7 @@ return_problems(rpmps ps, int translate_message, int raw_message) { static char * pack_list(Header header, rpmTag tag_name, rpmTag tag_flags, rpmTag tag_version, rpmsenseFlags (*check_flag)(rpmsenseFlags)) { char buff[65536]; - uint32_t *flags = NULL; + rpmsenseFlags *flags = NULL; const char **list_evr = NULL; char *p = buff; HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he)); @@ -904,7 +904,7 @@ pack_list(Header header, rpmTag tag_name, rpmTag tag_flags, rpmTag tag_version, HE_t he_flags = memset(alloca(sizeof(*he_flags)), 0, sizeof(*he_flags)); he_flags->tag = tag_flags; if(headerGet(header, he_flags, 0)) - flags = he_flags->p.ui32p; + flags = (rpmsenseFlags*)he_flags->p.ui32p; } if (tag_version) { HE_t he_list_evr = memset(alloca(sizeof(*he_list_evr)), 0, sizeof(*he_list_evr)); @@ -1003,7 +1003,7 @@ update_provides(URPM__Package pkg, HV *provides) { if (pkg->h) { int len; HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he)); - uint32_t *flags = NULL; + rpmsenseFlags *flags = NULL; /* examine requires for files which need to be marked in provides */ he->tag = RPMTAG_REQUIRENAME; @@ -1023,7 +1023,7 @@ update_provides(URPM__Package pkg, HV *provides) { he->tag = RPMTAG_PROVIDEFLAGS; if (headerGet(pkg->h, he, 0)) { HE_t he_flags = memset(alloca(sizeof(*he_flags)), 0, sizeof(*he_flags)); - flags = he_flags->p.ui32p; + flags = (rpmsenseFlags*)he_flags->p.ui32p; } for (he->ix = 0; he->ix < (int)he->c; he->ix++) { len = strlen(list[he->ix]); -- cgit v1.2.1