fix a bunch of warnings
(cherry picked from commit 61d98c5a1d
)
Conflicts:
src/drv_imap.c
src/sync.c
This commit is contained in:
parent
f8a913ac80
commit
4dc7e17f3e
|
@ -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:
|
||||||
|
|
|
@ -303,7 +303,7 @@ init_ssl_ctx( imap_store_t *ctx )
|
||||||
imap_t *imap = ctx->imap;
|
imap_t *imap = ctx->imap;
|
||||||
imap_store_conf_t *conf = (imap_store_conf_t *)ctx->gen.conf;
|
imap_store_conf_t *conf = (imap_store_conf_t *)ctx->gen.conf;
|
||||||
imap_server_conf_t *srvc = conf->server;
|
imap_server_conf_t *srvc = 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)
|
||||||
|
|
|
@ -641,7 +641,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 );
|
||||||
|
|
|
@ -119,7 +119,7 @@ dump_box( store_t *ctx )
|
||||||
if (Debug)
|
if (Debug)
|
||||||
for (msg = ctx->msgs; msg; msg = msg->next) {
|
for (msg = ctx->msgs; msg; msg = msg->next) {
|
||||||
make_flags( msg->flags, fbuf );
|
make_flags( msg->flags, fbuf );
|
||||||
printf( " message %d, %s, %d\n", msg->uid, fbuf, msg->size );
|
printf( " message %d, %s, %lu\n", msg->uid, fbuf, msg->size );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user