Author: dim
Date: Tue Feb  4 19:46:29 2020
New Revision: 357523
URL: https://svnweb.freebsd.org/changeset/base/357523

Log:
  MFC r357340:
  
  Merge r357339 from the clang1000-import branch:
  
  Fix the following -Werror warning from clang 10.0.0 in bsnmpd:
  
  usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c:1661:4: error: misleading 
indentation; statement is not part of the previous 'else' 
[-Werror,-Wmisleading-indentation]
                          return (-1);
                          ^
  usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c:1658:5: note: previous statement is 
here
                  } else
                    ^
  
  The intent was to group the return statement with the previous syslog()
  call.

Modified:
  stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
  stable/11/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
Directory Properties:
  stable/10/   (props changed)
  stable/11/   (props changed)

Modified: stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
==============================================================================
--- stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c Tue Feb  4 19:45:51 
2020        (r357522)
+++ stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c Tue Feb  4 19:46:29 
2020        (r357523)
@@ -1655,10 +1655,11 @@ altq_is_enabled(int pfdev)
                        syslog(LOG_INFO, "No ALTQ support in kernel\n"
                            "ALTQ related functions disabled\n");
                        return (0);
-               } else
+               } else {
                        syslog(LOG_ERR, "DIOCGETALTQS returned an error: %s",
                            strerror(errno));
                        return (-1);
+               }
        }
        return (1);
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to