Author: brooks
Date: Wed Aug 28 08:09:10 2019
New Revision: 351568
URL: https://svnweb.freebsd.org/changeset/base/351568

Log:
  MFC r351389:
  
  Reorganise conditionals to reduce duplication.
  
  No functional change.
  
  Obtained from:        CheriBSD
  Sponsored by: DARPA, AFRL

Modified:
  stable/12/sys/kern/makesyscalls.sh
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/kern/makesyscalls.sh
==============================================================================
--- stable/12/sys/kern/makesyscalls.sh  Wed Aug 28 08:05:16 2019        
(r351567)
+++ stable/12/sys/kern/makesyscalls.sh  Wed Aug 28 08:09:10 2019        
(r351568)
@@ -503,20 +503,20 @@ sed -e '
                }
                printf("\t\t*n_args = %d;\n\t\tbreak;\n\t}\n", argc) > systrace
                printf("\t\tbreak;\n") > systracetmp
-               if (argc != 0 && !flag("NOARGS") && !flag("NOPROTO") && \
-                   !flag("NODEF")) {
-                       printf("struct %s {\n", argalias) > sysarg
-                       for (i = 1; i <= argc; i++)
-                               printf("\tchar %s_l_[PADL_(%s)]; " \
-                                   "%s %s; char %s_r_[PADR_(%s)];\n",
-                                   argname[i], argtype[i],
-                                   argtype[i], argname[i],
-                                   argname[i], argtype[i]) > sysarg
-                       printf("};\n") > sysarg
+               if (!flag("NOARGS") && !flag("NOPROTO") && !flag("NODEF")) {
+                       if (argc != 0) {
+                               printf("struct %s {\n", argalias) > sysarg
+                               for (i = 1; i <= argc; i++)
+                                       printf("\tchar %s_l_[PADL_(%s)]; " \
+                                           "%s %s; char %s_r_[PADR_(%s)];\n",
+                                           argname[i], argtype[i],
+                                           argtype[i], argname[i],
+                                           argname[i], argtype[i]) > sysarg
+                               printf("};\n") > sysarg
+                       } else
+                               printf("struct %s {\n\tregister_t dummy;\n};\n",
+                                   argalias) > sysarg
                }
-               else if (!flag("NOARGS") && !flag("NOPROTO") && !flag("NODEF"))
-                       printf("struct %s {\n\tregister_t dummy;\n};\n",
-                           argalias) > sysarg
                if (!flag("NOPROTO") && !flag("NODEF")) {
                        if (funcname == "nosys" || funcname == "lkmnosys" ||
                            funcname == "sysarch" || funcname ~ /^freebsd/ || 
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to