Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb459f45 authored by Adrian Bunk's avatar Adrian Bunk Committed by Trond Myklebust
Browse files

SUNRPC: net/sunrpc/xdr.c: remove xdr_decode_string() 



 This patch removes ths unused function xdr_decode_string().

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Acked-by: default avatarCharles Lever <Charles.Lever@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a72b4422

include/linux/sunrpc/xdr.h

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ struct xdr_buf { 
u32 *	xdr_encode_opaque_fixed(u32 *p, const void *ptr, unsigned int len);

u32 *	xdr_encode_opaque(u32 *p, const void *ptr, unsigned int len);

u32 *	xdr_encode_string(u32 *p, const char *s);

u32 *	xdr_decode_string(u32 *p, char **sp, int *lenp, int maxlen);

u32 *	xdr_decode_string_inplace(u32 *p, char **sp, int *lenp, int maxlen);

u32 *	xdr_encode_netobj(u32 *p, const struct xdr_netobj *);

u32 *	xdr_decode_netobj(u32 *p, struct xdr_netobj *);

net/sunrpc/xdr.c

+0 −21
Original line number Diff line number Diff line
@@ -92,27 +92,6 @@ xdr_encode_string(u32 *p, const char *string) 
	return xdr_encode_array(p, string, strlen(string));

}



u32 *

xdr_decode_string(u32 *p, char **sp, int *lenp, int maxlen)

{

	unsigned int	len;

	char		*string;



	if ((len = ntohl(*p++)) > maxlen)

		return NULL;

	if (lenp)

		*lenp = len;

	if ((len % 4) != 0) {

		string = (char *) p;

	} else {

		string = (char *) (p - 1);

		memmove(string, p, len);

	}

	string[len] = '\0';

	*sp = string;

	return p + XDR_QUADLEN(len);

}



u32 *

xdr_decode_string_inplace(u32 *p, char **sp, int *lenp, int maxlen)

{