From 9dc0b8bd674f71f8ee422b037dc409f2dd4f9487 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Tue, 14 Mar 2006 09:10:20 +0000 Subject: merge Mirek's fetchmail-signed.patch svn path=/branches/BRANCH_6-3/; revision=4734 --- uid.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'uid.c') diff --git a/uid.c b/uid.c index ff993f59..6516c329 100644 --- a/uid.c +++ b/uid.c @@ -248,7 +248,7 @@ void initialize_saved_lists(struct query *hostlist, const char *idfile) report_build(stdout, GT_("Old UID list from %s:"), ctl->server.pollname); for (idp = ctl->oldsaved; idp; idp = idp->next) - report_build(stdout, " %s", (char *)idp->id); + report_build(stdout, " %s", idp->id); if (!idp) report_build(stdout, GT_(" ")); report_complete(stdout, "\n"); @@ -259,7 +259,7 @@ void initialize_saved_lists(struct query *hostlist, const char *idfile) { report_build(stdout, GT_("Scratch list of UIDs:")); for (idp = scratchlist; idp; idp = idp->next) - report_build(stdout, " %s", (char *)idp->id); + report_build(stdout, " %s", idp->id); if (!idp) report_build(stdout, GT_(" ")); report_complete(stdout, "\n"); @@ -282,7 +282,7 @@ void initialize_saved_lists(struct query *hostlist, const char *idfile) continue; *end = (struct idlist *)xmalloc(sizeof(struct idlist)); - (*end)->id = (unsigned char *)str; + (*end)->id = str; (*end)->val.status.mark = status; (*end)->val.status.num = 0; (*end)->next = NULL; @@ -349,11 +349,11 @@ struct idlist *str_in_list(struct idlist **idl, const char *str, const flag case struct idlist *walk; if (caseblind) { for( walk = *idl; walk; walk = walk->next ) - if( strcasecmp( str, (char *)walk->id) == 0 ) + if( strcasecmp( str, walk->id) == 0 ) return walk; } else { for( walk = *idl; walk; walk = walk->next ) - if( strcmp( str, (char *)walk->id) == 0 ) + if( strcmp( str, walk->id) == 0 ) return walk; } return NULL; @@ -515,7 +515,7 @@ void uid_swap_lists(struct query *ctl) else report_build(stdout, GT_("New UID list from %s:"), ctl->server.pollname); for (idp = dofastuidl ? ctl->oldsaved : ctl->newsaved; idp; idp = idp->next) - report_build(stdout, " %s = %d", (char *)idp->id, idp->val.status.mark); + report_build(stdout, " %s = %d", idp->id, idp->val.status.mark); if (!idp) report_build(stdout, GT_(" ")); report_complete(stdout, "\n"); @@ -565,7 +565,7 @@ void uid_discard_new_list(struct query *ctl) * poll are marked here. */ report_build(stdout, GT_("Merged UID list from %s:"), ctl->server.pollname); for (idp = ctl->oldsaved; idp; idp = idp->next) - report_build(stdout, " %s = %d", (char *)idp->id, idp->val.status.mark); + report_build(stdout, " %s = %d", idp->id, idp->val.status.mark); if (!idp) report_build(stdout, GT_(" ")); report_complete(stdout, "\n"); @@ -627,7 +627,7 @@ void write_saved_lists(struct query *hostlist, const char *idfile) if (idp->val.status.mark == UID_SEEN || idp->val.status.mark == UID_DELETED) fprintf(tmpfp, "%s@%s %s\n", - ctl->remotename, ctl->server.queryname, (char *)idp->id); + ctl->remotename, ctl->server.queryname, idp->id); } for (idp = scratchlist; idp; idp = idp->next) fputs(idp->id, tmpfp); -- cgit v1.2.3