fix a bunch of warnings

This commit is contained in:
Oswald Buddenhagen 2012-07-07 17:19:17 +02:00
parent 4afd31a457
commit 61d98c5a1d
4 changed files with 7 additions and 7 deletions

View File

@ -73,7 +73,7 @@ convert( config_t *box )
FILE *fp; FILE *fp;
msg_t *msgs; msg_t *msgs;
DB *db; DB *db;
int i, ret, fd, uidval, maxuid, bl, uid, rmsgs, nmsgs, uv[2]; int i, ret, fd, uidval, maxuid, uid, rmsgs, nmsgs, uv[2];
unsigned u; unsigned u;
struct stat sb; struct stat sb;
char buf[_POSIX_PATH_MAX], diumname[_POSIX_PATH_MAX], char buf[_POSIX_PATH_MAX], diumname[_POSIX_PATH_MAX],
@ -160,7 +160,7 @@ convert( config_t *box )
rmsgs = 0; rmsgs = 0;
nmsgs = 0; nmsgs = 0;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
bl = nfsnprintf( buf, sizeof(buf), "%s/%s/", mboxdir, subdirs[i] ); nfsnprintf( buf, sizeof(buf), "%s/%s/", mboxdir, subdirs[i] );
if (!(d = opendir( buf ))) { if (!(d = opendir( buf ))) {
perror( "opendir" ); perror( "opendir" );
err4: err4:

View File

@ -324,7 +324,7 @@ static int
init_ssl_ctx( imap_store_t *ctx ) init_ssl_ctx( imap_store_t *ctx )
{ {
imap_server_conf_t *srvc = ((imap_store_conf_t *)ctx->gen.conf)->server; imap_server_conf_t *srvc = ((imap_store_conf_t *)ctx->gen.conf)->server;
SSL_METHOD *method; const SSL_METHOD *method;
int options = 0; int options = 0;
if (srvc->use_tlsv1 && !srvc->use_sslv2 && !srvc->use_sslv3) if (srvc->use_tlsv1 && !srvc->use_sslv2 && !srvc->use_sslv3)

View File

@ -661,7 +661,7 @@ maildir_scan( maildir_store_t *ctx, msglist_t *msglist )
else else
u = ru = strchr( entry->base, ':' ); u = ru = strchr( entry->base, ':' );
fnl = (u ? fnl = (u ?
nfsnprintf( buf + bl, sizeof(buf) - bl, "%s/%.*s,U=%d%s", subdirs[entry->recent], u - entry->base, entry->base, uid, ru ) : nfsnprintf( buf + bl, sizeof(buf) - bl, "%s/%.*s,U=%d%s", subdirs[entry->recent], (int)(u - entry->base), entry->base, uid, ru ) :
nfsnprintf( buf + bl, sizeof(buf) - bl, "%s/%s,U=%d", subdirs[entry->recent], entry->base, uid )) nfsnprintf( buf + bl, sizeof(buf) - bl, "%s/%s,U=%d", subdirs[entry->recent], entry->base, uid ))
+ 1 - 4; + 1 - 4;
memcpy( nbuf, buf, bl + 4 ); memcpy( nbuf, buf, bl + 4 );

View File

@ -963,7 +963,7 @@ msgs_found_sel( sync_vars_t *svars, int t )
copy_vars_t *cv; copy_vars_t *cv;
flag_vars_t *fv; flag_vars_t *fv;
const char *diag; const char *diag;
int uid, minwuid, *mexcs, nmexcs, rmexcs, no[2], del[2], todel, nmsgs, t1, t2; int uid, minwuid, *mexcs, nmexcs, rmexcs, no[2], del[2], todel, t1, t2;
int sflags, nflags, aflags, dflags, nex; int sflags, nflags, aflags, dflags, nex;
char fbuf[16]; /* enlarge when support for keywords is added */ char fbuf[16]; /* enlarge when support for keywords is added */
@ -981,7 +981,7 @@ msgs_found_sel( sync_vars_t *svars, int t )
uid = tmsg->uid; uid = tmsg->uid;
if (DFlags & DEBUG) { if (DFlags & DEBUG) {
make_flags( tmsg->flags, fbuf ); make_flags( tmsg->flags, fbuf );
printf( svars->ctx[t]->opts & OPEN_SIZE ? " message %5d, %-4s, %6d: " : " message %5d, %-4s: ", uid, fbuf, tmsg->size ); printf( svars->ctx[t]->opts & OPEN_SIZE ? " message %5d, %-4s, %6lu: " : " message %5d, %-4s: ", uid, fbuf, tmsg->size );
} }
for (srec = nsrec; srec; srec = srec->next) { for (srec = nsrec; srec; srec = srec->next) {
if (srec->status & S_DEAD) if (srec->status & S_DEAD)
@ -1081,7 +1081,7 @@ msgs_found_sel( sync_vars_t *svars, int t )
debug( "synchronizing new entries\n" ); debug( "synchronizing new entries\n" );
svars->osrecadd = svars->srecadd; svars->osrecadd = svars->srecadd;
for (t = 0; t < 2; t++) { for (t = 0; t < 2; t++) {
for (nmsgs = 0, tmsg = svars->ctx[1-t]->msgs; tmsg; tmsg = tmsg->next) for (tmsg = svars->ctx[1-t]->msgs; tmsg; tmsg = tmsg->next)
if (tmsg->srec ? tmsg->srec->uid[t] < 0 && (tmsg->srec->uid[t] == -1 ? (svars->chan->ops[t] & OP_RENEW) : (svars->chan->ops[t] & OP_NEW)) : (svars->chan->ops[t] & OP_NEW)) { if (tmsg->srec ? tmsg->srec->uid[t] < 0 && (tmsg->srec->uid[t] == -1 ? (svars->chan->ops[t] & OP_RENEW) : (svars->chan->ops[t] & OP_NEW)) : (svars->chan->ops[t] & OP_NEW)) {
debug( "new message %d on %s\n", tmsg->uid, str_ms[1-t] ); debug( "new message %d on %s\n", tmsg->uid, str_ms[1-t] );
if ((svars->chan->ops[t] & OP_EXPUNGE) && (tmsg->flags & F_DELETED)) if ((svars->chan->ops[t] & OP_EXPUNGE) && (tmsg->flags & F_DELETED))