Merge 7.0 commit 'ca9c95' into PSI-7.0

modules/database/src/std/rec/boRecord.dbd.pod

@@ -36,7 +36,7 @@ The desired output needs to be in engineering units.
 
 The first field that determines where the desired output originates is the
 output mode select (OMSL) field, which can have two possible values:
-C<losed_loop> or C<supervisory>. If C<supervisory> is specified, the value
+C<closed_loop> or C<supervisory>. If C<supervisory> is specified, the value
 in the VAL field can be set externally via dbPuts at run-time. If
 C<closed_loop> is specified, the VAL field's value is obtained from the
 address specified in the Desired Output Link (DOL) field which can be a

modules/database/src/std/rec/printfRecord.c

@@ -57,6 +57,14 @@
     else \
         flags |= F_BADLNK
 
+#ifdef __GNUC__
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wformat-security"
+/* Intentionally passing non-const format string to epicsSnprintf() below.
+ * Older GCC does not allow pragma GCC within function body.
+ */
+#endif
+
 static void doPrintf(printfRecord *prec)
 {
     const char *pfmt = prec->fmt;
@@ -314,6 +322,9 @@ static void doPrintf(printfRecord *prec)
     prec->len = pval - prec->val;
 }
 
+#ifdef __GNUC__
+#  pragma GCC diagnostic pop
+#endif
 
 static long init_record(struct dbCommon *pcommon, int pass)
 {