Merge 3.15 branch into 7.0
This commit is contained in:
@@ -126,8 +126,7 @@ static long init_record(struct dbCommon *pcommon, int pass)
|
||||
if(status)
|
||||
return status;
|
||||
}
|
||||
|
||||
strncpy(prec->oval, prec->val, sizeof(prec->val));
|
||||
strncpy(prec->oval, prec->val, sizeof(prec->oval));
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -215,7 +214,7 @@ static void monitor(stringoutRecord *prec)
|
||||
|
||||
if (strncmp(prec->oval, prec->val, sizeof(prec->val))) {
|
||||
monitor_mask |= DBE_VALUE | DBE_LOG;
|
||||
strncpy(prec->oval, prec->val, sizeof(prec->val));
|
||||
strncpy(prec->oval, prec->val, sizeof(prec->oval));
|
||||
}
|
||||
|
||||
if (prec->mpst == stringoutPOST_Always)
|
||||
|
||||
Reference in New Issue
Block a user