Merge branch 'V5-4-patches' into V5-5-patches

* V5-4-patches:
  Fix commit 7f4a7b891332899cea26e95be0337aae01648742: dont mix code and declarations.
diff --git a/snmplib/mib.c b/snmplib/mib.c
index 364d8c6..f298e2f 100644
--- a/snmplib/mib.c
+++ b/snmplib/mib.c
@@ -1755,6 +1755,8 @@
                     const struct enum_list *enums,
                     const char *hint, const char *units)
 {
+    u_char          str[] = "NULL";
+
     if (var->type != ASN_NULL) {
         if (!netsnmp_ds_get_boolean(
                 NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
@@ -1767,7 +1769,6 @@
                                           NULL);
     }
 
-    u_char          str[] = "NULL";
     return snmp_strcat(buf, buf_len, out_len, allow_realloc, str);
 }