Should the #ifdef and #endif be one line higher?  That lets me commit.

Or is this just new commit hook code-zanyism?

The error is for my test code; there are some defines to try to make
things fit in 80 columns.  See the current code listing below....

The current code will no longer commit.

===

ERROR: trailing statements should be on next line
#216: FILE: src/MainNFSD/nfs_rpc_dispatcher_thread.c:1765:
+       } else if (req->rq_msg.cb_prog == NFS_pcpp[P_MNT]
[...]
+                  && ((NFS_pcpco & CORE_OPTION_NFSV3) != 0)) {


===

         } else if (req->rq_prog == nfs_param.core_param.program[P_NLM]
#ifdef _USE_NLM
                    && ((nfs_param.core_param.core_options & CORE_OPTION_NFSV3)
                        != 0)) {
                 if (req->rq_vers == NLM4_VERS) {
                         if (req->rq_proc <= NLMPROC4_FREE_ALL)
                                 return true;
                         else
                                 goto noproc_err;
                 } else {
                         lo_vers = NLM4_VERS;
                         hi_vers = NLM4_VERS;
                         goto progvers_err;
                 }
         } else if (req->rq_prog == nfs_param.core_param.program[P_MNT]
#endif /* _USE_NLM */
                    && ((nfs_param.core_param.core_options & CORE_OPTION_NFSV3)
                        != 0)) {
                 /* Some clients may use the wrong mount version to umount, so
                  * always allow umount, otherwise only allow request if the
                  * appropriate mount version is enabled.  Also need to allow
                  * dump and export, so just disallow mount if version not
                  * supported.
                  */

------------------------------------------------------------------------------
_______________________________________________
Nfs-ganesha-devel mailing list
Nfs-ganesha-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel

Reply via email to