emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mount: code shrink (-81 bytes)

Browse Source 
Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Alexander Shishkin 2010-10-22 13:35:47 +02:00 committed by Denys Vlasenko
parent 6722737ece
commit 54779a47e9
1 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
util-linux/mount.c
View File

@ -775,78 +775,52 @@ static char *nfs_strerror(int status)
static bool_t xdr_fhandle(XDR *xdrs, fhandle objp) static bool_t xdr_fhandle(XDR *xdrs, fhandle objp)
{ {
if (!xdr_opaque(xdrs, objp, FHSIZE)) return xdr_opaque(xdrs, objp, FHSIZE);
return FALSE;
return TRUE;
} }
static bool_t xdr_fhstatus(XDR *xdrs, fhstatus *objp) static bool_t xdr_fhstatus(XDR *xdrs, fhstatus *objp)
{ {
if (!xdr_u_int(xdrs, &objp->fhs_status)) if (!xdr_u_int(xdrs, &objp->fhs_status))
return FALSE; return FALSE;
switch (objp->fhs_status) { if (objp->fhs_status == 0)
case 0: return xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle);
if (!xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle))
return FALSE;
break;
default:
break;
}
return TRUE; return TRUE;
} }
static bool_t xdr_dirpath(XDR *xdrs, dirpath *objp) static bool_t xdr_dirpath(XDR *xdrs, dirpath *objp)
{ {
if (!xdr_string(xdrs, objp, MNTPATHLEN)) return xdr_string(xdrs, objp, MNTPATHLEN);
return FALSE;
return TRUE;
} }
static bool_t xdr_fhandle3(XDR *xdrs, fhandle3 *objp) static bool_t xdr_fhandle3(XDR *xdrs, fhandle3 *objp)
{ {
if (!xdr_bytes(xdrs, (char **)&objp->fhandle3_val, return xdr_bytes(xdrs, (char **)&objp->fhandle3_val,
(unsigned int *) &objp->fhandle3_len, (unsigned int *) &objp->fhandle3_len,
FHSIZE3) FHSIZE3);
) {
return FALSE;
}
return TRUE;
} }
static bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp) static bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp)
{ {
if (!xdr_fhandle3(xdrs, &objp->fhandle)) if (!xdr_fhandle3(xdrs, &objp->fhandle))
return FALSE; return FALSE;
if (!xdr_array(xdrs, &(objp->auth_flavours.auth_flavours_val), return xdr_array(xdrs, &(objp->auth_flavours.auth_flavours_val),
&(objp->auth_flavours.auth_flavours_len), &(objp->auth_flavours.auth_flavours_len),
~0, ~0,
sizeof(int), sizeof(int),
(xdrproc_t) xdr_int) (xdrproc_t) xdr_int);
) {
return FALSE;
}
return TRUE;
} }
static bool_t xdr_mountstat3(XDR *xdrs, mountstat3 *objp) static bool_t xdr_mountstat3(XDR *xdrs, mountstat3 *objp)
{ {
if (!xdr_enum(xdrs, (enum_t *) objp)) return xdr_enum(xdrs, (enum_t *) objp);
return FALSE;
return TRUE;
} }
static bool_t xdr_mountres3(XDR *xdrs, mountres3 *objp) static bool_t xdr_mountres3(XDR *xdrs, mountres3 *objp)
{ {
if (!xdr_mountstat3(xdrs, &objp->fhs_status)) if (!xdr_mountstat3(xdrs, &objp->fhs_status))
return FALSE; return FALSE;
switch (objp->fhs_status) { if (objp->fhs_status == MNT_OK)
case MNT_OK: return xdr_mountres3_ok(xdrs, &objp->mountres3_u.mountinfo);
if (!xdr_mountres3_ok(xdrs, &objp->mountres3_u.mountinfo))
return FALSE;
break;
default:
break;
}
return TRUE; return TRUE;
} }