modify to the way we used XDR definitions files (.x files)

Earlier:
step 1: copy the existing <xdr>.x files to /tmp
step 2: generate '.[ch]' files using 'rpcgen <xdr>.x'
step 3: check diff with the to the existing files, add only your part
        of changes back to the original file. (ignore other changes).
step 4: there is another file to write wrapper functions to convert
        structures to/from XDR buffers, update it with your new structure.
step 5: use these wrapper functions in the newly written procedures.
step 6: commit :-|

Now:
step 1: update (mostly adding only) the <xdr>.x file
step 2: run '<path-to-src>/extras/generate-xdr-files.sh <xdr>.x' command
step 3: implement rpc procedure to handle the request/response.
step 4: commit :-)

Change-Id: I219f9159fc980438c86e847c6b030be96e595ea2
BUG: 3488
Reviewed-on: http://review.gluster.com/341
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@gluster.com>

1 files changed, 20 insertions, 19 deletions

diff --git a/cli/src/cli.c b/cli/src/cli.c
index eec14d6fad0..51270f8a00a 100644
--- a/cli/src/cli.c
+++ b/cli/src/cli.c
@@ -74,6 +74,8 @@
 #include "call-stub.h"
 #include <fnmatch.h>
 
+#include "xdr-generic.h"
+
 extern int connected;
 /* using argp for command line parsing */
 static char gf_doc[] = "";
@@ -265,8 +267,7 @@ int
 cli_submit_request (void *req, call_frame_t *frame,
                     rpc_clnt_prog_t *prog,
                     int procnum, struct iobref *iobref,
-                    cli_serialize_t sfunc, xlator_t *this,
-                    fop_cbk_fn_t cbkfn, xdrproc_t xdrproc)
+                    xlator_t *this, fop_cbk_fn_t cbkfn, xdrproc_t xdrproc)
 {
         int                     ret         = -1;
         int                     count      = 0;
@@ -278,30 +279,30 @@ cli_submit_request (void *req, call_frame_t *frame,
 
         GF_ASSERT (this);
 
-        xdr_size = xdr_sizeof (xdrproc, req);
-        iobuf = iobuf_get2 (this->ctx->iobuf_pool, xdr_size);
-        if (!iobuf) {
-                goto out;
-        };
+        if (req) {
+                xdr_size = xdr_sizeof (xdrproc, req);
+                iobuf = iobuf_get2 (this->ctx->iobuf_pool, xdr_size);
+                if (!iobuf) {
+                        goto out;
+                };
 
-        if (!iobref) {
-                iobref = iobref_new ();
                 if (!iobref) {
-                        goto out;
-                }
+                        iobref = iobref_new ();
+                        if (!iobref) {
+                                goto out;
+                        }
 
-                new_iobref = 1;
-        }
+                        new_iobref = 1;
+                }
 
-        iobref_add (iobref, iobuf);
+                iobref_add (iobref, iobuf);
 
-        iov.iov_base = iobuf->ptr;
-        iov.iov_len  = iobuf_size (iobuf);
+                iov.iov_base = iobuf->ptr;
+                iov.iov_len  = iobuf_size (iobuf);
 
 
-        /* Create the xdr payload */
-        if (req && sfunc) {
-                ret = sfunc (iov, req);
+                /* Create the xdr payload */
+                ret = xdr_serialize_generic (iov, req, xdrproc);
                 if (ret == -1) {
                         goto out;
                 }