From 6e84e9a497f392a891283957ae2a29a47aee65c8 Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Thu, 13 Jul 2017 22:05:28 -0700 Subject: [PATCH] drop unused flags argument from imap_access We are not using an actual interface so it is pointless. --- imap/imap.c | 5 ++--- imap/imap.h | 10 +++++----- mx.c | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/imap/imap.c b/imap/imap.c index 635b37dd..f1fc49a9 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -55,7 +55,7 @@ static void imap_set_flag (IMAP_DATA* idata, int aclbit, int flag, /* imap_access: Check permissions on an IMAP mailbox. * TODO: ACL checks. Right now we assume if it exists we can * mess with it. */ -int imap_access (const char* path, int flags) +int imap_access (const char* path) { IMAP_DATA* idata; IMAP_MBOX mx; @@ -809,8 +809,7 @@ static int imap_open_mailbox_append (CONTEXT *ctx, int flags) strfcpy (mailbox, "INBOX", sizeof (mailbox)); FREE (&mx.mbox); - /* really we should also check for W_OK */ - if ((rc = imap_access (ctx->path, F_OK)) == 0) + if ((rc = imap_access (ctx->path)) == 0) return 0; if (rc == -1) diff --git a/imap/imap.h b/imap/imap.h index 94506ea9..4a7be5b4 100644 --- a/imap/imap.h +++ b/imap/imap.h @@ -1,21 +1,21 @@ /* * Copyright (C) 1996-1998 Michael R. Elkins * Copyright (C) 2000-2007 Brendan Cully - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ + */ #ifndef _IMAP_H #define _IMAP_H 1 @@ -32,7 +32,7 @@ typedef struct } IMAP_MBOX; /* imap.c */ -int imap_access (const char*, int); +int imap_access (const char *path); int imap_check_mailbox (CONTEXT *ctx, int *index_hint, int force); int imap_delete_mailbox (CONTEXT* idata, IMAP_MBOX mx); int imap_sync_mailbox (CONTEXT *ctx, int expunge, int *index_hint); diff --git a/mx.c b/mx.c index 9a8396f5..5d6782aa 100644 --- a/mx.c +++ b/mx.c @@ -499,7 +499,7 @@ int mx_access (const char* path, int flags) { #ifdef USE_IMAP if (mx_is_imap (path)) - return imap_access (path, flags); + return imap_access (path); #endif return access (path, flags); -- 2.40.0