Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-10-11 10:23:41 +00:00
Code Issues Projects Releases Wiki Activity

Remove _().

Browse Source
This commit is contained in:
Rob Landley 2006-05-29 04:49:55 +00:00
parent 4e3aff3425
commit 8394729ddf
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
util-linux/nfsmount.c
View File

@ -502,19 +502,18 @@ int nfsmount(const char *spec, const char *node, int *flags,
else if (!strncmp(opteq+1, "udp", 3)) else if (!strncmp(opteq+1, "udp", 3))
tcp = 0; tcp = 0;
else else
printf(_("Warning: Unrecognized proto= option.\n")); printf("Warning: Unrecognized proto= option.\n");
} else if (!strcmp(opt, "namlen")) { } else if (!strcmp(opt, "namlen")) {
#if NFS_MOUNT_VERSION >= 2 #if NFS_MOUNT_VERSION >= 2
if (nfs_mount_version >= 2) if (nfs_mount_version >= 2)
data.namlen = val; data.namlen = val;
else else
#endif #endif
printf(_("Warning: Option namlen is not supported.\n")); printf("Warning: Option namlen is not supported.\n");
} else if (!strcmp(opt, "addr")) } else if (!strcmp(opt, "addr"))
/* ignore */; /* ignore */;
else { else {
printf(_("unknown nfs mount parameter: " printf("unknown nfs mount parameter: %s=%d\n", opt, val);
"%s=%d\n"), opt, val);
goto fail; goto fail;
} }
} }
@ -548,10 +547,9 @@ int nfsmount(const char *spec, const char *node, int *flags,
if (nfs_mount_version >= 3) if (nfs_mount_version >= 3)
nolock = !val; nolock = !val;
else else
printf(_("Warning: option nolock is not supported.\n")); printf("Warning: option nolock is not supported.\n");
} else { } else {
printf(_("unknown nfs mount option: " printf("unknown nfs mount option: %s%s\n", val ? "" : "no", opt);
"%s%s\n"), val ? "" : "no", opt);
goto fail; goto fail;
} }
} }
@ -809,18 +807,18 @@ int nfsmount(const char *spec, const char *node, int *flags,
if (tcp) { if (tcp) {
if (nfs_mount_version < 3) { if (nfs_mount_version < 3) {
printf(_("NFS over TCP is not supported.\n")); printf("NFS over TCP is not supported.\n");
goto fail; goto fail;
} }
fsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); fsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
} else } else
fsock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); fsock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (fsock < 0) { if (fsock < 0) {
perror(_("nfs socket")); perror("nfs socket");
goto fail; goto fail;
} }
if (bindresvport(fsock, 0) < 0) { if (bindresvport(fsock, 0) < 0) {
perror(_("nfs bindresvport")); perror("nfs bindresvport");
goto fail; goto fail;
} }
if (port == 0) { if (port == 0) {
@ -831,11 +829,11 @@ int nfsmount(const char *spec, const char *node, int *flags,
port = NFS_PORT; port = NFS_PORT;
#ifdef NFS_MOUNT_DEBUG #ifdef NFS_MOUNT_DEBUG
else else
printf(_("used portmapper to find NFS port\n")); printf("used portmapper to find NFS port\n");
#endif #endif
} }
#ifdef NFS_MOUNT_DEBUG #ifdef NFS_MOUNT_DEBUG
printf(_("using port %d for nfs daemon\n"), port); printf("using port %d for nfs daemon\n", port);
#endif #endif
server_addr.sin_port = htons(port); server_addr.sin_port = htons(port);
/* /*
@ -846,7 +844,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
if (get_linux_version_code() <= KERNEL_VERSION(2,3,10) if (get_linux_version_code() <= KERNEL_VERSION(2,3,10)
&& connect(fsock, (struct sockaddr *) &server_addr, && connect(fsock, (struct sockaddr *) &server_addr,
sizeof (server_addr)) < 0) { sizeof (server_addr)) < 0) {
perror(_("nfs connect")); perror("nfs connect");
goto fail; goto fail;
} }
@ -936,7 +934,7 @@ static char *nfs_strerror(int status)
if (nfs_errtbl[i].stat == status) if (nfs_errtbl[i].stat == status)
return strerror(nfs_errtbl[i].errnum); return strerror(nfs_errtbl[i].errnum);
} }
sprintf(buf, _("unknown nfs status return value: %d"), status); sprintf(buf, "unknown nfs status return value: %d", status);
return buf; return buf;
} }