From b11e11a9737a6490f27f9ea5c15b39203fbcbe7a Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 11 Nov 2009 14:04:54 -0500 Subject: [PATCH] mount.cifs: get rid of CONST_DISCARD MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Apparently, we need to strip the "const" attribute off of the mnt_fstype before passing it to addmntent to prevent a (somewhat bogus) compiler warning. Rather than just stripping off the "const" attribute, clarify the code by declaring a new non-const char pointer that points to the same string. We can also use that same pointer in the mount(2) call too. Signed-off-by: Jeff Layton Acked-by: Matthias Dieter Wallnöfer --- client/mount.cifs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/client/mount.cifs.c b/client/mount.cifs.c index 3baaad79371..a9c18279178 100644 --- a/client/mount.cifs.c +++ b/client/mount.cifs.c @@ -76,8 +76,6 @@ #define MAX_UNC_LEN 1024 -#define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr))) - #ifndef SAFE_FREE #define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0) #endif @@ -123,6 +121,7 @@ static char * user_name = NULL; static char * mountpassword = NULL; char * domain_name = NULL; char * prefixpath = NULL; +char *cifs_fstype = "cifs"; /* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We * don't link to libreplace so need them here. */ @@ -1590,7 +1589,7 @@ mount_retry: if (verboseflag) fprintf(stderr, "\n"); - if (!fakemnt && mount(dev_name, mountpoint, "cifs", flags, options)) { + if (!fakemnt && mount(dev_name, mountpoint, cifs_fstype, flags, options)) { switch (errno) { case ECONNREFUSED: case EHOSTUNREACH: @@ -1638,7 +1637,7 @@ mount_retry: } mountent.mnt_fsname = dev_name; mountent.mnt_dir = mountpoint; - mountent.mnt_type = CONST_DISCARD(char *,"cifs"); + mountent.mnt_type = cifs_fstype; mountent.mnt_opts = (char *)malloc(220); if(mountent.mnt_opts) { char * mount_user = getusername(); -- 2.11.4.GIT