From 9c29b498f4ad14318ce8b83e5d622be1463fa1eb Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Thu, 5 Jul 2012 07:46:52 +1000 Subject: [PATCH] Update how the rpc files are generated so we dont get "unused variable" for *buf --- mount/Makefile.am | 2 +- mount/libnfs-raw-mount.c | 16 +++++ nfs/Makefile.am | 2 +- nfs/libnfs-raw-nfs.c | 136 +++++++++++++++++++++++++++++++++++ nlm/Makefile.am | 2 +- nlm/libnfs-raw-nlm.c | 19 +++++ portmap/Makefile.am | 2 +- portmap/libnfs-raw-portmap.c | 3 + rquota/Makefile.am | 2 +- rquota/libnfs-raw-rquota.c | 7 ++ 10 files changed, 186 insertions(+), 5 deletions(-) diff --git a/mount/Makefile.am b/mount/Makefile.am index b14568a..c063316 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -18,4 +18,4 @@ mount-stamp : mount.x compile_rpc: rpcgen -h @RPCGENFLAGS@ mount.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-mount.h - rpcgen -c @RPCGENFLAGS@ mount.x | sed -e "s/#include \".*mount.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-mount.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-mount.c \ No newline at end of file + rpcgen -c @RPCGENFLAGS@ mount.x | sed -e "s/#include \".*mount.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-mount.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-mount.c diff --git a/mount/libnfs-raw-mount.c b/mount/libnfs-raw-mount.c index 75bdc21..81fae00 100644 --- a/mount/libnfs-raw-mount.c +++ b/mount/libnfs-raw-mount.c @@ -10,6 +10,7 @@ bool_t zdr_fhandle3 (ZDR *zdrs, fhandle3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bytes (zdrs, (char **)&objp->fhandle3_val, (u_int *) &objp->fhandle3_len, FHSIZE3)) return FALSE; @@ -20,6 +21,7 @@ bool_t zdr_dirpath (ZDR *zdrs, dirpath *objp) { register int32_t *buf; + buf = NULL; if (!zdr_string (zdrs, objp, MNTPATHLEN)) return FALSE; @@ -30,6 +32,7 @@ bool_t zdr_name (ZDR *zdrs, name *objp) { register int32_t *buf; + buf = NULL; if (!zdr_string (zdrs, objp, MNTNAMLEN)) return FALSE; @@ -40,6 +43,7 @@ bool_t zdr_mountstat3 (ZDR *zdrs, mountstat3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; @@ -50,6 +54,7 @@ bool_t zdr_mountlist (ZDR *zdrs, mountlist *objp) { register int32_t *buf; + buf = NULL; if (!zdr_pointer (zdrs, (char **)objp, sizeof (struct mountbody), (zdrproc_t) zdr_mountbody)) return FALSE; @@ -60,6 +65,7 @@ bool_t zdr_mountbody (ZDR *zdrs, mountbody *objp) { register int32_t *buf; + buf = NULL; if (!zdr_name (zdrs, &objp->ml_hostname)) return FALSE; @@ -74,6 +80,7 @@ bool_t zdr_groups (ZDR *zdrs, groups *objp) { register int32_t *buf; + buf = NULL; if (!zdr_pointer (zdrs, (char **)objp, sizeof (struct groupnode), (zdrproc_t) zdr_groupnode)) return FALSE; @@ -84,6 +91,7 @@ bool_t zdr_groupnode (ZDR *zdrs, groupnode *objp) { register int32_t *buf; + buf = NULL; if (!zdr_name (zdrs, &objp->gr_name)) return FALSE; @@ -96,6 +104,7 @@ bool_t zdr_exports (ZDR *zdrs, exports *objp) { register int32_t *buf; + buf = NULL; if (!zdr_pointer (zdrs, (char **)objp, sizeof (struct exportnode), (zdrproc_t) zdr_exportnode)) return FALSE; @@ -106,6 +115,7 @@ bool_t zdr_exportnode (ZDR *zdrs, exportnode *objp) { register int32_t *buf; + buf = NULL; if (!zdr_dirpath (zdrs, &objp->ex_dir)) return FALSE; @@ -120,6 +130,7 @@ bool_t zdr_mountres3_ok (ZDR *zdrs, mountres3_ok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_fhandle3 (zdrs, &objp->fhandle)) return FALSE; @@ -133,6 +144,7 @@ bool_t zdr_mountres3 (ZDR *zdrs, mountres3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_mountstat3 (zdrs, &objp->fhs_status)) return FALSE; @@ -151,6 +163,7 @@ bool_t zdr_mountstat1 (ZDR *zdrs, mountstat1 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; @@ -161,6 +174,7 @@ bool_t zdr_fhandle1 (ZDR *zdrs, fhandle1 objp) { register int32_t *buf; + buf = NULL; if (!zdr_opaque (zdrs, objp, FHSIZE)) return FALSE; @@ -171,6 +185,7 @@ bool_t zdr_mountres1_ok (ZDR *zdrs, mountres1_ok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_fhandle1 (zdrs, objp->fhandle)) return FALSE; @@ -181,6 +196,7 @@ bool_t zdr_mountres1 (ZDR *zdrs, mountres1 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_mountstat1 (zdrs, &objp->fhs_status)) return FALSE; diff --git a/nfs/Makefile.am b/nfs/Makefile.am index 141597d..1f0b1b4 100644 --- a/nfs/Makefile.am +++ b/nfs/Makefile.am @@ -18,4 +18,4 @@ nfs-stamp : nfs.x compile_rpc: rpcgen -h @RPCGENFLAGS@ nfs.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-nfs.h - rpcgen -c @RPCGENFLAGS@ nfs.x | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-nfs.c + rpcgen -c @RPCGENFLAGS@ nfs.x | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-nfs.c diff --git a/nfs/libnfs-raw-nfs.c b/nfs/libnfs-raw-nfs.c index 4d4f1d4..ce319ec 100644 --- a/nfs/libnfs-raw-nfs.c +++ b/nfs/libnfs-raw-nfs.c @@ -10,6 +10,7 @@ bool_t zdr_cookieverf3 (ZDR *zdrs, cookieverf3 objp) { register int32_t *buf; + buf = NULL; if (!zdr_opaque (zdrs, objp, NFS3_COOKIEVERFSIZE)) return FALSE; @@ -20,6 +21,7 @@ bool_t zdr_uint64 (ZDR *zdrs, uint64 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_u_quad_t (zdrs, objp)) return FALSE; @@ -30,6 +32,7 @@ bool_t zdr_cookie3 (ZDR *zdrs, cookie3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_uint64 (zdrs, objp)) return FALSE; @@ -40,6 +43,7 @@ bool_t zdr_nfs_fh3 (ZDR *zdrs, nfs_fh3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, NFS3_FHSIZE)) return FALSE; @@ -50,6 +54,7 @@ bool_t zdr_filename3 (ZDR *zdrs, filename3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_string (zdrs, objp, ~0)) return FALSE; @@ -60,6 +65,7 @@ bool_t zdr_diropargs3 (ZDR *zdrs, diropargs3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; @@ -72,6 +78,7 @@ bool_t zdr_ftype3 (ZDR *zdrs, ftype3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; @@ -82,6 +89,7 @@ bool_t zdr_mode3 (ZDR *zdrs, mode3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_u_int (zdrs, objp)) return FALSE; @@ -92,6 +100,7 @@ bool_t zdr_uid3 (ZDR *zdrs, uid3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_u_int (zdrs, objp)) return FALSE; @@ -102,6 +111,7 @@ bool_t zdr_gid3 (ZDR *zdrs, gid3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_u_int (zdrs, objp)) return FALSE; @@ -112,6 +122,7 @@ bool_t zdr_size3 (ZDR *zdrs, size3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_uint64 (zdrs, objp)) return FALSE; @@ -122,6 +133,7 @@ bool_t zdr_fileid3 (ZDR *zdrs, fileid3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_uint64 (zdrs, objp)) return FALSE; @@ -132,6 +144,7 @@ bool_t zdr_specdata3 (ZDR *zdrs, specdata3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_u_int (zdrs, &objp->specdata1)) return FALSE; @@ -144,6 +157,7 @@ bool_t zdr_nfstime3 (ZDR *zdrs, nfstime3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_u_int (zdrs, &objp->seconds)) return FALSE; @@ -156,6 +170,7 @@ bool_t zdr_fattr3 (ZDR *zdrs, fattr3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_ftype3 (zdrs, &objp->type)) return FALSE; @@ -190,6 +205,7 @@ bool_t zdr_post_op_attr (ZDR *zdrs, post_op_attr *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bool (zdrs, &objp->attributes_follow)) return FALSE; @@ -210,6 +226,7 @@ bool_t zdr_nfsstat3 (ZDR *zdrs, nfsstat3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; @@ -220,6 +237,7 @@ bool_t zdr_stable_how (ZDR *zdrs, stable_how *objp) { register int32_t *buf; + buf = NULL; if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; @@ -230,6 +248,7 @@ bool_t zdr_offset3 (ZDR *zdrs, offset3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_uint64 (zdrs, objp)) return FALSE; @@ -240,6 +259,7 @@ bool_t zdr_count3 (ZDR *zdrs, count3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_u_int (zdrs, objp)) return FALSE; @@ -250,6 +270,7 @@ bool_t zdr_wcc_attr (ZDR *zdrs, wcc_attr *objp) { register int32_t *buf; + buf = NULL; if (!zdr_size3 (zdrs, &objp->size)) return FALSE; @@ -264,6 +285,7 @@ bool_t zdr_pre_op_attr (ZDR *zdrs, pre_op_attr *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bool (zdrs, &objp->attributes_follow)) return FALSE; @@ -284,6 +306,7 @@ bool_t zdr_wcc_data (ZDR *zdrs, wcc_data *objp) { register int32_t *buf; + buf = NULL; if (!zdr_pre_op_attr (zdrs, &objp->before)) return FALSE; @@ -296,6 +319,7 @@ bool_t zdr_WRITE3args (ZDR *zdrs, WRITE3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; @@ -314,6 +338,7 @@ bool_t zdr_writeverf3 (ZDR *zdrs, writeverf3 objp) { register int32_t *buf; + buf = NULL; if (!zdr_opaque (zdrs, objp, NFS3_WRITEVERFSIZE)) return FALSE; @@ -324,6 +349,7 @@ bool_t zdr_WRITE3resok (ZDR *zdrs, WRITE3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; @@ -340,6 +366,7 @@ bool_t zdr_WRITE3resfail (ZDR *zdrs, WRITE3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; @@ -350,6 +377,7 @@ bool_t zdr_WRITE3res (ZDR *zdrs, WRITE3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -370,6 +398,7 @@ bool_t zdr_LOOKUP3args (ZDR *zdrs, LOOKUP3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_diropargs3 (zdrs, &objp->what)) return FALSE; @@ -380,6 +409,7 @@ bool_t zdr_LOOKUP3resok (ZDR *zdrs, LOOKUP3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; @@ -394,6 +424,7 @@ bool_t zdr_LOOKUP3resfail (ZDR *zdrs, LOOKUP3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; @@ -404,6 +435,7 @@ bool_t zdr_LOOKUP3res (ZDR *zdrs, LOOKUP3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -424,6 +456,7 @@ bool_t zdr_COMMIT3args (ZDR *zdrs, COMMIT3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; @@ -438,6 +471,7 @@ bool_t zdr_COMMIT3resok (ZDR *zdrs, COMMIT3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; @@ -450,6 +484,7 @@ bool_t zdr_COMMIT3resfail (ZDR *zdrs, COMMIT3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; @@ -460,6 +495,7 @@ bool_t zdr_COMMIT3res (ZDR *zdrs, COMMIT3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -480,6 +516,7 @@ bool_t zdr_ACCESS3args (ZDR *zdrs, ACCESS3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; @@ -492,6 +529,7 @@ bool_t zdr_ACCESS3resok (ZDR *zdrs, ACCESS3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; @@ -504,6 +542,7 @@ bool_t zdr_ACCESS3resfail (ZDR *zdrs, ACCESS3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; @@ -514,6 +553,7 @@ bool_t zdr_ACCESS3res (ZDR *zdrs, ACCESS3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -534,6 +574,7 @@ bool_t zdr_GETATTR3args (ZDR *zdrs, GETATTR3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; @@ -544,6 +585,7 @@ bool_t zdr_GETATTR3resok (ZDR *zdrs, GETATTR3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_fattr3 (zdrs, &objp->obj_attributes)) return FALSE; @@ -554,6 +596,7 @@ bool_t zdr_GETATTR3res (ZDR *zdrs, GETATTR3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -572,6 +615,7 @@ bool_t zdr_time_how (ZDR *zdrs, time_how *objp) { register int32_t *buf; + buf = NULL; if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; @@ -582,6 +626,7 @@ bool_t zdr_set_mode3 (ZDR *zdrs, set_mode3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; @@ -600,6 +645,7 @@ bool_t zdr_set_uid3 (ZDR *zdrs, set_uid3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; @@ -618,6 +664,7 @@ bool_t zdr_set_gid3 (ZDR *zdrs, set_gid3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; @@ -636,6 +683,7 @@ bool_t zdr_set_size3 (ZDR *zdrs, set_size3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; @@ -654,6 +702,7 @@ bool_t zdr_set_atime (ZDR *zdrs, set_atime *objp) { register int32_t *buf; + buf = NULL; if (!zdr_time_how (zdrs, &objp->set_it)) return FALSE; @@ -672,6 +721,7 @@ bool_t zdr_set_mtime (ZDR *zdrs, set_mtime *objp) { register int32_t *buf; + buf = NULL; if (!zdr_time_how (zdrs, &objp->set_it)) return FALSE; @@ -690,6 +740,7 @@ bool_t zdr_sattr3 (ZDR *zdrs, sattr3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_set_mode3 (zdrs, &objp->mode)) return FALSE; @@ -710,6 +761,7 @@ bool_t zdr_createmode3 (ZDR *zdrs, createmode3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; @@ -720,6 +772,7 @@ bool_t zdr_createverf3 (ZDR *zdrs, createverf3 objp) { register int32_t *buf; + buf = NULL; if (!zdr_opaque (zdrs, objp, NFS3_CREATEVERFSIZE)) return FALSE; @@ -730,6 +783,7 @@ bool_t zdr_createhow3 (ZDR *zdrs, createhow3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_createmode3 (zdrs, &objp->mode)) return FALSE; @@ -756,6 +810,7 @@ bool_t zdr_CREATE3args (ZDR *zdrs, CREATE3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; @@ -768,6 +823,7 @@ bool_t zdr_post_op_fh3 (ZDR *zdrs, post_op_fh3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bool (zdrs, &objp->handle_follows)) return FALSE; @@ -788,6 +844,7 @@ bool_t zdr_CREATE3resok (ZDR *zdrs, CREATE3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; @@ -802,6 +859,7 @@ bool_t zdr_CREATE3resfail (ZDR *zdrs, CREATE3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; @@ -812,6 +870,7 @@ bool_t zdr_CREATE3res (ZDR *zdrs, CREATE3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -832,6 +891,7 @@ bool_t zdr_REMOVE3args (ZDR *zdrs, REMOVE3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_diropargs3 (zdrs, &objp->object)) return FALSE; @@ -842,6 +902,7 @@ bool_t zdr_REMOVE3resok (ZDR *zdrs, REMOVE3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; @@ -852,6 +913,7 @@ bool_t zdr_REMOVE3resfail (ZDR *zdrs, REMOVE3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; @@ -862,6 +924,7 @@ bool_t zdr_REMOVE3res (ZDR *zdrs, REMOVE3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -882,6 +945,7 @@ bool_t zdr_READ3args (ZDR *zdrs, READ3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; @@ -896,6 +960,7 @@ bool_t zdr_READ3resok (ZDR *zdrs, READ3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; @@ -912,6 +977,7 @@ bool_t zdr_READ3resfail (ZDR *zdrs, READ3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; @@ -922,6 +988,7 @@ bool_t zdr_READ3res (ZDR *zdrs, READ3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -942,6 +1009,7 @@ bool_t zdr_FSINFO3args (ZDR *zdrs, FSINFO3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->fsroot)) return FALSE; @@ -952,6 +1020,7 @@ bool_t zdr_FSINFO3resok (ZDR *zdrs, FSINFO3resok *objp) { register int32_t *buf; + buf = NULL; if (zdrs->x_op == ZDR_ENCODE) { @@ -1057,6 +1126,7 @@ bool_t zdr_FSINFO3resfail (ZDR *zdrs, FSINFO3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; @@ -1067,6 +1137,7 @@ bool_t zdr_FSINFO3res (ZDR *zdrs, FSINFO3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1087,6 +1158,7 @@ bool_t zdr_FSSTAT3args (ZDR *zdrs, FSSTAT3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->fsroot)) return FALSE; @@ -1097,6 +1169,7 @@ bool_t zdr_FSSTAT3resok (ZDR *zdrs, FSSTAT3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; @@ -1121,6 +1194,7 @@ bool_t zdr_FSSTAT3resfail (ZDR *zdrs, FSSTAT3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; @@ -1131,6 +1205,7 @@ bool_t zdr_FSSTAT3res (ZDR *zdrs, FSSTAT3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1151,6 +1226,7 @@ bool_t zdr_PATHCONF3args (ZDR *zdrs, PATHCONF3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; @@ -1161,6 +1237,7 @@ bool_t zdr_PATHCONF3resok (ZDR *zdrs, PATHCONF3resok *objp) { register int32_t *buf; + buf = NULL; if (zdrs->x_op == ZDR_ENCODE) { @@ -1238,6 +1315,7 @@ bool_t zdr_PATHCONF3resfail (ZDR *zdrs, PATHCONF3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; @@ -1248,6 +1326,7 @@ bool_t zdr_PATHCONF3res (ZDR *zdrs, PATHCONF3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1268,6 +1347,7 @@ bool_t zdr_nfspath3 (ZDR *zdrs, nfspath3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_string (zdrs, objp, ~0)) return FALSE; @@ -1278,6 +1358,7 @@ bool_t zdr_symlinkdata3 (ZDR *zdrs, symlinkdata3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_sattr3 (zdrs, &objp->symlink_attributes)) return FALSE; @@ -1290,6 +1371,7 @@ bool_t zdr_SYMLINK3args (ZDR *zdrs, SYMLINK3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; @@ -1302,6 +1384,7 @@ bool_t zdr_SYMLINK3resok (ZDR *zdrs, SYMLINK3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; @@ -1316,6 +1399,7 @@ bool_t zdr_SYMLINK3resfail (ZDR *zdrs, SYMLINK3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; @@ -1326,6 +1410,7 @@ bool_t zdr_SYMLINK3res (ZDR *zdrs, SYMLINK3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1346,6 +1431,7 @@ bool_t zdr_READLINK3args (ZDR *zdrs, READLINK3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->symlink)) return FALSE; @@ -1356,6 +1442,7 @@ bool_t zdr_READLINK3resok (ZDR *zdrs, READLINK3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->symlink_attributes)) return FALSE; @@ -1368,6 +1455,7 @@ bool_t zdr_READLINK3resfail (ZDR *zdrs, READLINK3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->symlink_attributes)) return FALSE; @@ -1378,6 +1466,7 @@ bool_t zdr_READLINK3res (ZDR *zdrs, READLINK3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1398,6 +1487,7 @@ bool_t zdr_devicedata3 (ZDR *zdrs, devicedata3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_sattr3 (zdrs, &objp->dev_attributes)) return FALSE; @@ -1410,6 +1500,7 @@ bool_t zdr_mknoddata3 (ZDR *zdrs, mknoddata3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_ftype3 (zdrs, &objp->type)) return FALSE; @@ -1440,6 +1531,7 @@ bool_t zdr_MKNOD3args (ZDR *zdrs, MKNOD3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; @@ -1452,6 +1544,7 @@ bool_t zdr_MKNOD3resok (ZDR *zdrs, MKNOD3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; @@ -1466,6 +1559,7 @@ bool_t zdr_MKNOD3resfail (ZDR *zdrs, MKNOD3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; @@ -1476,6 +1570,7 @@ bool_t zdr_MKNOD3res (ZDR *zdrs, MKNOD3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1496,6 +1591,7 @@ bool_t zdr_MKDIR3args (ZDR *zdrs, MKDIR3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; @@ -1508,6 +1604,7 @@ bool_t zdr_MKDIR3resok (ZDR *zdrs, MKDIR3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; @@ -1522,6 +1619,7 @@ bool_t zdr_MKDIR3resfail (ZDR *zdrs, MKDIR3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; @@ -1532,6 +1630,7 @@ bool_t zdr_MKDIR3res (ZDR *zdrs, MKDIR3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1552,6 +1651,7 @@ bool_t zdr_RMDIR3args (ZDR *zdrs, RMDIR3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_diropargs3 (zdrs, &objp->object)) return FALSE; @@ -1562,6 +1662,7 @@ bool_t zdr_RMDIR3resok (ZDR *zdrs, RMDIR3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; @@ -1572,6 +1673,7 @@ bool_t zdr_RMDIR3resfail (ZDR *zdrs, RMDIR3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; @@ -1582,6 +1684,7 @@ bool_t zdr_RMDIR3res (ZDR *zdrs, RMDIR3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1602,6 +1705,7 @@ bool_t zdr_RENAME3args (ZDR *zdrs, RENAME3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_diropargs3 (zdrs, &objp->from)) return FALSE; @@ -1614,6 +1718,7 @@ bool_t zdr_RENAME3resok (ZDR *zdrs, RENAME3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->fromdir_wcc)) return FALSE; @@ -1626,6 +1731,7 @@ bool_t zdr_RENAME3resfail (ZDR *zdrs, RENAME3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->fromdir_wcc)) return FALSE; @@ -1638,6 +1744,7 @@ bool_t zdr_RENAME3res (ZDR *zdrs, RENAME3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1658,6 +1765,7 @@ bool_t zdr_READDIRPLUS3args (ZDR *zdrs, READDIRPLUS3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; @@ -1676,6 +1784,7 @@ bool_t zdr_entryplus3 (ZDR *zdrs, entryplus3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_fileid3 (zdrs, &objp->fileid)) return FALSE; @@ -1696,6 +1805,7 @@ bool_t zdr_dirlistplus3 (ZDR *zdrs, dirlistplus3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_pointer (zdrs, (char **)&objp->entries, sizeof (entryplus3), (zdrproc_t) zdr_entryplus3)) return FALSE; @@ -1708,6 +1818,7 @@ bool_t zdr_READDIRPLUS3resok (ZDR *zdrs, READDIRPLUS3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; @@ -1722,6 +1833,7 @@ bool_t zdr_READDIRPLUS3resfail (ZDR *zdrs, READDIRPLUS3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; @@ -1732,6 +1844,7 @@ bool_t zdr_READDIRPLUS3res (ZDR *zdrs, READDIRPLUS3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1752,6 +1865,7 @@ bool_t zdr_READDIR3args (ZDR *zdrs, READDIR3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; @@ -1768,6 +1882,7 @@ bool_t zdr_entry3 (ZDR *zdrs, entry3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_fileid3 (zdrs, &objp->fileid)) return FALSE; @@ -1784,6 +1899,7 @@ bool_t zdr_dirlist3 (ZDR *zdrs, dirlist3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_pointer (zdrs, (char **)&objp->entries, sizeof (entry3), (zdrproc_t) zdr_entry3)) return FALSE; @@ -1796,6 +1912,7 @@ bool_t zdr_READDIR3resok (ZDR *zdrs, READDIR3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; @@ -1810,6 +1927,7 @@ bool_t zdr_READDIR3resfail (ZDR *zdrs, READDIR3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; @@ -1820,6 +1938,7 @@ bool_t zdr_READDIR3res (ZDR *zdrs, READDIR3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1840,6 +1959,7 @@ bool_t zdr_LINK3args (ZDR *zdrs, LINK3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; @@ -1852,6 +1972,7 @@ bool_t zdr_LINK3resok (ZDR *zdrs, LINK3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; @@ -1864,6 +1985,7 @@ bool_t zdr_LINK3resfail (ZDR *zdrs, LINK3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; @@ -1876,6 +1998,7 @@ bool_t zdr_LINK3res (ZDR *zdrs, LINK3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1896,6 +2019,7 @@ bool_t zdr_sattrguard3 (ZDR *zdrs, sattrguard3 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bool (zdrs, &objp->check)) return FALSE; @@ -1916,6 +2040,7 @@ bool_t zdr_SETATTR3args (ZDR *zdrs, SETATTR3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; @@ -1930,6 +2055,7 @@ bool_t zdr_SETATTR3resok (ZDR *zdrs, SETATTR3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->obj_wcc)) return FALSE; @@ -1940,6 +2066,7 @@ bool_t zdr_SETATTR3resfail (ZDR *zdrs, SETATTR3resfail *objp) { register int32_t *buf; + buf = NULL; if (!zdr_wcc_data (zdrs, &objp->obj_wcc)) return FALSE; @@ -1950,6 +2077,7 @@ bool_t zdr_SETATTR3res (ZDR *zdrs, SETATTR3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -1970,6 +2098,7 @@ bool_t zdr_nfsacl_type (ZDR *zdrs, nfsacl_type *objp) { register int32_t *buf; + buf = NULL; if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; @@ -1980,6 +2109,7 @@ bool_t zdr_nfsacl_ace (ZDR *zdrs, nfsacl_ace *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsacl_type (zdrs, &objp->type)) return FALSE; @@ -1994,6 +2124,7 @@ bool_t zdr_GETACL3args (ZDR *zdrs, GETACL3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; @@ -2006,6 +2137,7 @@ bool_t zdr_GETACL3resok (ZDR *zdrs, GETACL3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->attr)) return FALSE; @@ -2028,6 +2160,7 @@ bool_t zdr_GETACL3res (ZDR *zdrs, GETACL3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; @@ -2046,6 +2179,7 @@ bool_t zdr_SETACL3args (ZDR *zdrs, SETACL3args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; @@ -2068,6 +2202,7 @@ bool_t zdr_SETACL3resok (ZDR *zdrs, SETACL3resok *objp) { register int32_t *buf; + buf = NULL; if (!zdr_post_op_attr (zdrs, &objp->attr)) return FALSE; @@ -2078,6 +2213,7 @@ bool_t zdr_SETACL3res (ZDR *zdrs, SETACL3res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; diff --git a/nlm/Makefile.am b/nlm/Makefile.am index 6945c1b..19391bd 100644 --- a/nlm/Makefile.am +++ b/nlm/Makefile.am @@ -18,4 +18,4 @@ nlm-stamp : nlm.x compile_rpc: rpcgen -h @RPCGENFLAGS@ nlm.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-nlm.h - rpcgen -c @RPCGENFLAGS@ nlm.x | sed -e "s/#include \".*nlm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nlm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-nlm.c + rpcgen -c @RPCGENFLAGS@ nlm.x | sed -e "s/#include \".*nlm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nlm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-nlm.c diff --git a/nlm/libnfs-raw-nlm.c b/nlm/libnfs-raw-nlm.c index 08417d4..808924a 100644 --- a/nlm/libnfs-raw-nlm.c +++ b/nlm/libnfs-raw-nlm.c @@ -10,6 +10,7 @@ bool_t zdr_nlm_fh4 (ZDR *zdrs, nlm_fh4 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, ~0)) return FALSE; @@ -20,6 +21,7 @@ bool_t zdr_nlm4_oh (ZDR *zdrs, nlm4_oh *objp) { register int32_t *buf; + buf = NULL; if (!zdr_string (zdrs, objp, ~0)) return FALSE; @@ -30,6 +32,7 @@ bool_t zdr_nlm_cookie (ZDR *zdrs, nlm_cookie *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, ~0)) return FALSE; @@ -40,6 +43,7 @@ bool_t zdr_nlmstat4 (ZDR *zdrs, nlmstat4 *objp) { register int32_t *buf; + buf = NULL; if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; @@ -50,6 +54,7 @@ bool_t zdr_nlm4_holder (ZDR *zdrs, nlm4_holder *objp) { register int32_t *buf; + buf = NULL; if (!zdr_bool (zdrs, &objp->exclusive)) return FALSE; @@ -68,6 +73,7 @@ bool_t zdr_nlm4_lock (ZDR *zdrs, nlm4_lock *objp) { register int32_t *buf; + buf = NULL; if (!zdr_string (zdrs, &objp->caller_name, NLM_MAXNAME)) return FALSE; @@ -88,6 +94,7 @@ bool_t zdr_nlm4_share (ZDR *zdrs, nlm4_share *objp) { register int32_t *buf; + buf = NULL; if (!zdr_string (zdrs, &objp->caller_name, NLM_MAXNAME)) return FALSE; @@ -106,6 +113,7 @@ bool_t zdr_nlm4_testres_denied (ZDR *zdrs, nlm4_testres_denied *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlm4_holder (zdrs, &objp->holder)) return FALSE; @@ -116,6 +124,7 @@ bool_t zdr_nlm4_testreply (ZDR *zdrs, nlm4_testreply *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlmstat4 (zdrs, &objp->status)) return FALSE; @@ -134,6 +143,7 @@ bool_t zdr_NLM4_TESTres (ZDR *zdrs, NLM4_TESTres *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlm_cookie (zdrs, &objp->cookie)) return FALSE; @@ -146,6 +156,7 @@ bool_t zdr_NLM4_TESTargs (ZDR *zdrs, NLM4_TESTargs *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlm_cookie (zdrs, &objp->cookie)) return FALSE; @@ -160,6 +171,7 @@ bool_t zdr_NLM4_CANCres (ZDR *zdrs, NLM4_CANCres *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlm_cookie (zdrs, &objp->cookie)) return FALSE; @@ -172,6 +184,7 @@ bool_t zdr_NLM4_CANCargs (ZDR *zdrs, NLM4_CANCargs *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlm_cookie (zdrs, &objp->cookie)) return FALSE; @@ -188,6 +201,7 @@ bool_t zdr_NLM4_UNLOCKres (ZDR *zdrs, NLM4_UNLOCKres *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlm_cookie (zdrs, &objp->cookie)) return FALSE; @@ -200,6 +214,7 @@ bool_t zdr_NLM4_UNLOCKargs (ZDR *zdrs, NLM4_UNLOCKargs *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlm_cookie (zdrs, &objp->cookie)) return FALSE; @@ -212,6 +227,7 @@ bool_t zdr_NLM4_LOCKres (ZDR *zdrs, NLM4_LOCKres *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlm_cookie (zdrs, &objp->cookie)) return FALSE; @@ -224,6 +240,7 @@ bool_t zdr_NLM4_LOCKargs (ZDR *zdrs, NLM4_LOCKargs *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlm_cookie (zdrs, &objp->cookie)) return FALSE; @@ -244,6 +261,7 @@ bool_t zdr_NLM4_GRANTEDargs (ZDR *zdrs, NLM4_GRANTEDargs *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlm_cookie (zdrs, &objp->cookie)) return FALSE; @@ -258,6 +276,7 @@ bool_t zdr_NLM4_GRANTEDres (ZDR *zdrs, NLM4_GRANTEDres *objp) { register int32_t *buf; + buf = NULL; if (!zdr_nlm_cookie (zdrs, &objp->cookie)) return FALSE; diff --git a/portmap/Makefile.am b/portmap/Makefile.am index 794c2c6..96fc61f 100644 --- a/portmap/Makefile.am +++ b/portmap/Makefile.am @@ -18,4 +18,4 @@ portmap-stamp : portmap.x compile_rpc: rpcgen -h @RPCGENFLAGS@ portmap.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-portmap.h - rpcgen -c @RPCGENFLAGS@ portmap.x | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-zdr.h\"\n#include \"libnfs-raw-portmap.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-portmap.c + rpcgen -c @RPCGENFLAGS@ portmap.x | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-zdr.h\"\n#include \"libnfs-raw-portmap.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-portmap.c diff --git a/portmap/libnfs-raw-portmap.c b/portmap/libnfs-raw-portmap.c index c3f094f..3477564 100644 --- a/portmap/libnfs-raw-portmap.c +++ b/portmap/libnfs-raw-portmap.c @@ -10,6 +10,7 @@ bool_t zdr_pmap_mapping (ZDR *zdrs, pmap_mapping *objp) { register int32_t *buf; + buf = NULL; if (zdrs->x_op == ZDR_ENCODE) { @@ -65,6 +66,7 @@ bool_t zdr_pmap_call_args (ZDR *zdrs, pmap_call_args *objp) { register int32_t *buf; + buf = NULL; if (zdrs->x_op == ZDR_ENCODE) { @@ -120,6 +122,7 @@ bool_t zdr_pmap_call_result (ZDR *zdrs, pmap_call_result *objp) { register int32_t *buf; + buf = NULL; if (!zdr_u_int (zdrs, &objp->port)) return FALSE; diff --git a/rquota/Makefile.am b/rquota/Makefile.am index fe3f37d..eb93504 100644 --- a/rquota/Makefile.am +++ b/rquota/Makefile.am @@ -18,4 +18,4 @@ rquota-stamp : rquota.x compile_rpc: rpcgen -h @RPCGENFLAGS@ rquota.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-rquota.h - rpcgen -c @RPCGENFLAGS@ rquota.x | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-rquota.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-rquota.c + rpcgen -c @RPCGENFLAGS@ rquota.x | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-rquota.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" > libnfs-raw-rquota.c diff --git a/rquota/libnfs-raw-rquota.c b/rquota/libnfs-raw-rquota.c index da246dd..4b0e330 100644 --- a/rquota/libnfs-raw-rquota.c +++ b/rquota/libnfs-raw-rquota.c @@ -10,6 +10,7 @@ bool_t zdr_rquotastat (ZDR *zdrs, rquotastat *objp) { register int32_t *buf; + buf = NULL; if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; @@ -20,6 +21,7 @@ bool_t zdr_exportpath (ZDR *zdrs, exportpath *objp) { register int32_t *buf; + buf = NULL; if (!zdr_string (zdrs, objp, RQUOTAPATHLEN)) return FALSE; @@ -30,6 +32,7 @@ bool_t zdr_GETQUOTA1args (ZDR *zdrs, GETQUOTA1args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_exportpath (zdrs, &objp->export)) return FALSE; @@ -42,6 +45,7 @@ bool_t zdr_quotatype (ZDR *zdrs, quotatype *objp) { register int32_t *buf; + buf = NULL; if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; @@ -52,6 +56,7 @@ bool_t zdr_GETQUOTA2args (ZDR *zdrs, GETQUOTA2args *objp) { register int32_t *buf; + buf = NULL; if (!zdr_exportpath (zdrs, &objp->export)) return FALSE; @@ -66,6 +71,7 @@ bool_t zdr_GETQUOTA1res_ok (ZDR *zdrs, GETQUOTA1res_ok *objp) { register int32_t *buf; + buf = NULL; if (zdrs->x_op == ZDR_ENCODE) { @@ -169,6 +175,7 @@ bool_t zdr_GETQUOTA1res (ZDR *zdrs, GETQUOTA1res *objp) { register int32_t *buf; + buf = NULL; if (!zdr_rquotastat (zdrs, &objp->status)) return FALSE; -- 2.34.1