diff options
Diffstat (limited to 'util-linux/nfsmount.c')
| -rw-r--r-- | util-linux/nfsmount.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c index f8735e5..a8c0b0e 100644 --- a/util-linux/nfsmount.c +++ b/util-linux/nfsmount.c @@ -300,7 +300,7 @@ int nfsmount(const char *spec, const char *node, int *flags, msock = fsock = -1; mclient = NULL; if (strlen(spec) >= sizeof(hostdir)) { - errorMsg("excessively long host:dir argument\n"); + error_msg("excessively long host:dir argument\n"); goto fail; } strcpy(hostdir, spec); @@ -312,10 +312,10 @@ int nfsmount(const char *spec, const char *node, int *flags, until they can be fully supported. (mack@sgi.com) */ if ((s = strchr(hostdir, ','))) { *s = '\0'; - errorMsg("warning: multiple hostnames not supported\n"); + error_msg("warning: multiple hostnames not supported\n"); } } else { - errorMsg("directory to mount not in host:dir format\n"); + error_msg("directory to mount not in host:dir format\n"); goto fail; } @@ -325,11 +325,11 @@ int nfsmount(const char *spec, const char *node, int *flags, #endif { if ((hp = gethostbyname(hostname)) == NULL) { - errorMsg("can't get address for %s\n", hostname); + error_msg("can't get address for %s\n", hostname); goto fail; } else { if (hp->h_length > sizeof(struct in_addr)) { - errorMsg("got bad hp->h_length\n"); + error_msg("got bad hp->h_length\n"); hp->h_length = sizeof(struct in_addr); } memcpy(&server_addr.sin_addr, @@ -346,7 +346,7 @@ int nfsmount(const char *spec, const char *node, int *flags, if (!old_opts) old_opts = ""; if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) { - errorMsg("excessively long option argument\n"); + error_msg("excessively long option argument\n"); goto fail; } sprintf(new_opts, "%s%saddr=%s", @@ -506,11 +506,11 @@ int nfsmount(const char *spec, const char *node, int *flags, data.flags |= (nolock ? NFS_MOUNT_NONLM : 0); #endif if (nfsvers > MAX_NFSPROT) { - errorMsg("NFSv%d not supported!\n", nfsvers); + error_msg("NFSv%d not supported!\n", nfsvers); return 0; } if (mountvers > MAX_NFSPROT) { - errorMsg("NFSv%d not supported!\n", nfsvers); + error_msg("NFSv%d not supported!\n", nfsvers); return 0; } if (nfsvers && !mountvers) @@ -570,11 +570,11 @@ int nfsmount(const char *spec, const char *node, int *flags, mount_server_addr.sin_addr.s_addr = inet_addr(hostname); } else { if ((hp = gethostbyname(mounthost)) == NULL) { - errorMsg("can't get address for %s\n", hostname); + error_msg("can't get address for %s\n", hostname); goto fail; } else { if (hp->h_length > sizeof(struct in_addr)) { - errorMsg("got bad hp->h_length?\n"); + error_msg("got bad hp->h_length?\n"); hp->h_length = sizeof(struct in_addr); } mount_server_addr.sin_family = AF_INET; @@ -709,7 +709,7 @@ int nfsmount(const char *spec, const char *node, int *flags, if (nfsvers == 2) { if (status.nfsv2.fhs_status != 0) { - errorMsg("%s:%s failed, reason given by server: %s\n", + error_msg("%s:%s failed, reason given by server: %s\n", hostname, dirname, nfs_strerror(status.nfsv2.fhs_status)); goto fail; @@ -727,7 +727,7 @@ int nfsmount(const char *spec, const char *node, int *flags, #if NFS_MOUNT_VERSION >= 4 fhandle3 *fhandle; if (status.nfsv3.fhs_status != 0) { - errorMsg("%s:%s failed, reason given by server: %s\n", + error_msg("%s:%s failed, reason given by server: %s\n", hostname, dirname, nfs_strerror(status.nfsv3.fhs_status)); goto fail; |