Skip to content

Commit 95d1e3d

Browse files
committed
test/nc_test/test_write.m4 compile warning -Wstringop-truncation
1 parent 7ac6690 commit 95d1e3d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

test/nc_test/test_write.m4

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,7 +1807,7 @@ TestFunc(rename_var)(VarArgs)
18071807
EXPECT_ERR(NC_ENAMEINUSE, err)
18081808
ELSE_NOK
18091809
strcpy(name, "new_");
1810-
strncat(name, var_name[i], sizeof(name) - strlen(name) - 1);
1810+
strncat(name, var_name[i], NC_MAX_NAME - strlen(name) - 1);
18111811
err = APIFunc(rename_var)(ncid, i, name);
18121812
IF (err != NC_NOERR)
18131813
error("rename_var: %s", APIFunc(strerror)(err));
@@ -1826,7 +1826,7 @@ TestFunc(rename_var)(VarArgs)
18261826
error("enddef: %s", APIFunc(strerror)(err));
18271827
for (i = 0; i < numVars; i++) {
18281828
strcpy(name, "even_longer_");
1829-
strncat(name, var_name[i], sizeof(name) - strlen(name) - 1);
1829+
strncat(name, var_name[i], NC_MAX_NAME - strlen(name) - 1);
18301830
err = APIFunc(rename_var)(ncid, i, name);
18311831
IF (err != NC_ENOTINDEFINE)
18321832
EXPECT_ERR(NC_ENOTINDEFINE, err)
@@ -2143,7 +2143,7 @@ TestFunc(rename_att)(AttVarArgs)
21432143
EXPECT_ERR(NC_ENOTATT, err)
21442144
ELSE_NOK
21452145
strcpy(newname, "new_");
2146-
strncat(newname, attname, sizeof(newname) - strlen(newname) - 1);
2146+
strncat(newname, attname, NC_MAX_NAME - strlen(newname) - 1);
21472147
err = APIFunc(rename_att)(ncid, varid, attname, newname);
21482148
IF (err != NC_NOERR)
21492149
error("rename_att: %s", APIFunc(strerror)(err));
@@ -2171,7 +2171,7 @@ TestFunc(rename_att)(AttVarArgs)
21712171
atttype = ATT_TYPE(i,j);
21722172
attlength = ATT_LEN(i,j);
21732173
strcpy(newname, "new_");
2174-
strncat(newname, attname, sizeof(newname) - strlen(newname) - 1);
2174+
strncat(newname, attname, NC_MAX_NAME - strlen(newname) - 1);
21752175
err = APIFunc(inq_attname)(ncid, varid, j, name);
21762176
IF (err != NC_NOERR)
21772177
error("inq_attname: %s", APIFunc(strerror)(err));
@@ -2218,9 +2218,9 @@ TestFunc(rename_att)(AttVarArgs)
22182218
for (j = 0; j < NATTS(i); j++) {
22192219
attname = ATT_NAME(i,j);
22202220
strcpy(oldname, "new_");
2221-
strncat(oldname, attname, sizeof(oldname) - strlen(oldname) - 1);
2221+
strncat(oldname, attname, NC_MAX_NAME - strlen(oldname) - 1);
22222222
strcpy(newname, "even_longer_");
2223-
strncat(newname, attname, sizeof(newname) - strlen(newname) - 1);
2223+
strncat(newname, attname, NC_MAX_NAME - strlen(newname) - 1);
22242224
err = APIFunc(rename_att)(ncid, varid, oldname, newname);
22252225
IF (err != NC_ENOTINDEFINE)
22262226
EXPECT_ERR(NC_ENOTINDEFINE, err)

0 commit comments

Comments
 (0)