aboutsummaryrefslogtreecommitdiff
path: root/nfsmount.c
diff options
context:
space:
mode:
authormarkw <markw@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-12-07 19:56:48 +0000
committermarkw <markw@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-12-07 19:56:48 +0000
commitb529ac16d7308cb6e852b286b42ebe971a32cd3f (patch)
treea55822621d54bd82c54e272fa986e45698fea0f1 /nfsmount.c
parentad3527fc1543422f053975ac4f37365a8585d7c5 (diff)
downloadbusybox-w32-b529ac16d7308cb6e852b286b42ebe971a32cd3f.tar.gz
busybox-w32-b529ac16d7308cb6e852b286b42ebe971a32cd3f.tar.bz2
busybox-w32-b529ac16d7308cb6e852b286b42ebe971a32cd3f.zip
Changed names of functions in utility.c and all affected files, to make
compliant with the style guide. Everybody rebuild your tags file! git-svn-id: svn://busybox.net/trunk/busybox@1398 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'nfsmount.c')
-rw-r--r--nfsmount.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/nfsmount.c b/nfsmount.c
index f8735e52c..a8c0b0ea6 100644
--- a/nfsmount.c
+++ b/nfsmount.c
@@ -300,7 +300,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
300 msock = fsock = -1; 300 msock = fsock = -1;
301 mclient = NULL; 301 mclient = NULL;
302 if (strlen(spec) >= sizeof(hostdir)) { 302 if (strlen(spec) >= sizeof(hostdir)) {
303 errorMsg("excessively long host:dir argument\n"); 303 error_msg("excessively long host:dir argument\n");
304 goto fail; 304 goto fail;
305 } 305 }
306 strcpy(hostdir, spec); 306 strcpy(hostdir, spec);
@@ -312,10 +312,10 @@ int nfsmount(const char *spec, const char *node, int *flags,
312 until they can be fully supported. (mack@sgi.com) */ 312 until they can be fully supported. (mack@sgi.com) */
313 if ((s = strchr(hostdir, ','))) { 313 if ((s = strchr(hostdir, ','))) {
314 *s = '\0'; 314 *s = '\0';
315 errorMsg("warning: multiple hostnames not supported\n"); 315 error_msg("warning: multiple hostnames not supported\n");
316 } 316 }
317 } else { 317 } else {
318 errorMsg("directory to mount not in host:dir format\n"); 318 error_msg("directory to mount not in host:dir format\n");
319 goto fail; 319 goto fail;
320 } 320 }
321 321
@@ -325,11 +325,11 @@ int nfsmount(const char *spec, const char *node, int *flags,
325#endif 325#endif
326 { 326 {
327 if ((hp = gethostbyname(hostname)) == NULL) { 327 if ((hp = gethostbyname(hostname)) == NULL) {
328 errorMsg("can't get address for %s\n", hostname); 328 error_msg("can't get address for %s\n", hostname);
329 goto fail; 329 goto fail;
330 } else { 330 } else {
331 if (hp->h_length > sizeof(struct in_addr)) { 331 if (hp->h_length > sizeof(struct in_addr)) {
332 errorMsg("got bad hp->h_length\n"); 332 error_msg("got bad hp->h_length\n");
333 hp->h_length = sizeof(struct in_addr); 333 hp->h_length = sizeof(struct in_addr);
334 } 334 }
335 memcpy(&server_addr.sin_addr, 335 memcpy(&server_addr.sin_addr,
@@ -346,7 +346,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
346 if (!old_opts) 346 if (!old_opts)
347 old_opts = ""; 347 old_opts = "";
348 if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) { 348 if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) {
349 errorMsg("excessively long option argument\n"); 349 error_msg("excessively long option argument\n");
350 goto fail; 350 goto fail;
351 } 351 }
352 sprintf(new_opts, "%s%saddr=%s", 352 sprintf(new_opts, "%s%saddr=%s",
@@ -506,11 +506,11 @@ int nfsmount(const char *spec, const char *node, int *flags,
506 data.flags |= (nolock ? NFS_MOUNT_NONLM : 0); 506 data.flags |= (nolock ? NFS_MOUNT_NONLM : 0);
507#endif 507#endif
508 if (nfsvers > MAX_NFSPROT) { 508 if (nfsvers > MAX_NFSPROT) {
509 errorMsg("NFSv%d not supported!\n", nfsvers); 509 error_msg("NFSv%d not supported!\n", nfsvers);
510 return 0; 510 return 0;
511 } 511 }
512 if (mountvers > MAX_NFSPROT) { 512 if (mountvers > MAX_NFSPROT) {
513 errorMsg("NFSv%d not supported!\n", nfsvers); 513 error_msg("NFSv%d not supported!\n", nfsvers);
514 return 0; 514 return 0;
515 } 515 }
516 if (nfsvers && !mountvers) 516 if (nfsvers && !mountvers)
@@ -570,11 +570,11 @@ int nfsmount(const char *spec, const char *node, int *flags,
570 mount_server_addr.sin_addr.s_addr = inet_addr(hostname); 570 mount_server_addr.sin_addr.s_addr = inet_addr(hostname);
571 } else { 571 } else {
572 if ((hp = gethostbyname(mounthost)) == NULL) { 572 if ((hp = gethostbyname(mounthost)) == NULL) {
573 errorMsg("can't get address for %s\n", hostname); 573 error_msg("can't get address for %s\n", hostname);
574 goto fail; 574 goto fail;
575 } else { 575 } else {
576 if (hp->h_length > sizeof(struct in_addr)) { 576 if (hp->h_length > sizeof(struct in_addr)) {
577 errorMsg("got bad hp->h_length?\n"); 577 error_msg("got bad hp->h_length?\n");
578 hp->h_length = sizeof(struct in_addr); 578 hp->h_length = sizeof(struct in_addr);
579 } 579 }
580 mount_server_addr.sin_family = AF_INET; 580 mount_server_addr.sin_family = AF_INET;
@@ -709,7 +709,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
709 709
710 if (nfsvers == 2) { 710 if (nfsvers == 2) {
711 if (status.nfsv2.fhs_status != 0) { 711 if (status.nfsv2.fhs_status != 0) {
712 errorMsg("%s:%s failed, reason given by server: %s\n", 712 error_msg("%s:%s failed, reason given by server: %s\n",
713 hostname, dirname, 713 hostname, dirname,
714 nfs_strerror(status.nfsv2.fhs_status)); 714 nfs_strerror(status.nfsv2.fhs_status));
715 goto fail; 715 goto fail;
@@ -727,7 +727,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
727#if NFS_MOUNT_VERSION >= 4 727#if NFS_MOUNT_VERSION >= 4
728 fhandle3 *fhandle; 728 fhandle3 *fhandle;
729 if (status.nfsv3.fhs_status != 0) { 729 if (status.nfsv3.fhs_status != 0) {
730 errorMsg("%s:%s failed, reason given by server: %s\n", 730 error_msg("%s:%s failed, reason given by server: %s\n",
731 hostname, dirname, 731 hostname, dirname,
732 nfs_strerror(status.nfsv3.fhs_status)); 732 nfs_strerror(status.nfsv3.fhs_status));
733 goto fail; 733 goto fail;