Skip to content

avt sprintf to snprintf #20497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cyrush wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

avt sprintf to snprintf #20497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af76796
avt sprintf to snprintf
cyrush Jul 21, 2025
038a110
visitpy sprintf to snprintf
cyrush Jul 21, 2025
c04cd5a
another one
cyrush Jul 25, 2025
478bcb7
Merge branch 'develop' into task/2025_07_sprintf_to_snprintf
cyrush Aug 3, 2025
7af5d57
Merge branch 'develop' into task/2025_07_sprintf_to_snprintf
cyrush Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/avt/DBAtts/MetaData/avtMaterialMetaData.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,12 @@ avtMaterialMetaData::avtMaterialMetaData(const std::string &n,
//
// Programmer: Mark C. Miller
// Creation: Wed May 13 14:05:26 PDT 2009
//
// Modifications:
//
// Cyrus Harrison, Mon Jul 21 11:09:11 PDT 2025
// sprintf to snprintf
//
// ****************************************************************************

avtMaterialMetaData::avtMaterialMetaData(const std::string &n,
Expand All @@ -574,7 +580,7 @@ avtMaterialMetaData::avtMaterialMetaData(const std::string &n,
for (int i = 0; i < numMaterials; i++)
{
char tmpn[32];
sprintf(tmpn, "mat_%d", i);
snprintf(tmpn, 32, "mat_%d", i);
materialNames.push_back(tmpn);
}
}
Expand Down
8 changes: 7 additions & 1 deletion src/avt/DBAtts/MetaData/avtMaterialMetaData.code
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ Definition:
//
// Programmer: Mark C. Miller
// Creation: Wed May 13 14:05:26 PDT 2009
//
// Modifications:
//
// Cyrus Harrison, Mon Jul 21 11:09:11 PDT 2025
// sprintf to snprintf
//
// ****************************************************************************

avtMaterialMetaData::avtMaterialMetaData(const std::string &n,
Expand All @@ -80,7 +86,7 @@ avtMaterialMetaData::avtMaterialMetaData(const std::string &n,
for (int i = 0; i < numMaterials; i++)
{
char tmpn[32];
sprintf(tmpn, "mat_%d", i);
snprintf(tmpn, 32, "mat_%d", i);
materialNames.push_back(tmpn);
}
}
Expand Down
23 changes: 13 additions & 10 deletions src/avt/DBAtts/MetaData/avtMeshMetaData.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1956,6 +1956,9 @@ avtMeshMetaData::Print(ostream &out, int indent) const
// Hank Childs, Mon Jun 14 14:27:16 PDT 2010
// Fix crash for nlevels == 1 && patchs -> patches.
//
// Cyrus Harrison, Mon Jul 21 11:09:11 PDT 2025
// sprintf to snprintf
//
// ****************************************************************************

void
Expand Down Expand Up @@ -1993,28 +1996,28 @@ avtMeshMetaData::SetAMRInfo(const std::string &levelName,
for (i = 1 ; i < nlevels ; i++)
numbelow[i] = numbelow[i-1]+patchesPerLevel[i-1];
char str[128];
sprintf(str, "@%s%%d,%s%%d@", levelName.c_str(), patchName.c_str());
snprintf(str, 128, "@%s%%d,%s%%d@", levelName.c_str(), patchName.c_str());
std::string base_string = str;
for (i = 1 ; i < nlevels ; i++)
{
sprintf(str, "(n/%d)", numbelow[i]);
snprintf(str, 128, "(n/%d)", numbelow[i]);
base_string += str;
if (i != (nlevels-1))
base_string += "?(";
}
for (i = nlevels-1 ; i >= 0 ; i--)
{
if (i == (nlevels-1))
sprintf(str, "?%d", i+origin);
snprintf(str, 128, "?%d", i+origin);
else if (i > 0)
sprintf(str, ":%d:)", i+origin);
snprintf(str, 128, ":%d:)", i+origin);
else
sprintf(str, ":%d:@", i+origin);
snprintf(str, 128, ":%d:@", i+origin);
base_string += str;
}
for (i = 1 ; i < nlevels ; i++)
{
sprintf(str, "(n/%d)", numbelow[i]);
snprintf(str, 128, "(n/%d)", numbelow[i]);
base_string += str;
if (i != (nlevels-1))
base_string += "?(";
Expand All @@ -2024,17 +2027,17 @@ avtMeshMetaData::SetAMRInfo(const std::string &levelName,
for (i = nlevels-1 ; i >= 0 ; i--)
{
if (i == (nlevels-1))
sprintf(str, "n+%d-%d", origin, numbelow[i]);
snprintf(str, 128, "n+%d-%d", origin, numbelow[i]);
else if (i > 0)
sprintf(str, ":n+%d-%d:)", origin, numbelow[i]);
snprintf(str, 128, ":n+%d-%d:)", origin, numbelow[i]);
else
sprintf(str, ":n+%d:", origin);
snprintf(str, 128, ":n+%d:", origin);
base_string += str;
}
if (nlevels <= 1)
{
// logic above doesn't work for nlevels == 1, just override
sprintf(str, "@%s%d,%s%%d@n+%d:", levelName.c_str(), origin,
snprintf(str, 128, "@%s%d,%s%%d@n+%d:", levelName.c_str(), origin,
patchName.c_str(), origin);
base_string = str;
}
Expand Down
24 changes: 13 additions & 11 deletions src/avt/DBAtts/MetaData/avtMeshMetaData.code
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,9 @@ Definition:
// Hank Childs, Mon Jun 14 14:27:16 PDT 2010
// Fix crash for nlevels == 1 && patchs -> patches.
//
// Cyrus Harrison, Mon Jul 21 11:09:11 PDT 2025
// sprintf to snprintf
//
// ****************************************************************************

void
Expand Down Expand Up @@ -824,28 +827,28 @@ avtMeshMetaData::SetAMRInfo(const std::string &levelName,
for (i = 1 ; i < nlevels ; i++)
numbelow[i] = numbelow[i-1]+patchesPerLevel[i-1];
char str[128];
sprintf(str, "@%s%%d,%s%%d@", levelName.c_str(), patchName.c_str());
snprintf(str, 128, "@%s%%d,%s%%d@", levelName.c_str(), patchName.c_str());
std::string base_string = str;
for (i = 1 ; i < nlevels ; i++)
{
sprintf(str, "(n/%d)", numbelow[i]);
snprintf(str, 128, "(n/%d)", numbelow[i]);
base_string += str;
if (i != (nlevels-1))
base_string += "?(";
}
for (i = nlevels-1 ; i >= 0 ; i--)
{
if (i == (nlevels-1))
sprintf(str, "?%d", i+origin);
snprintf(str, 128, "?%d", i+origin);
else if (i > 0)
sprintf(str, ":%d:)", i+origin);
snprintf(str, 128, ":%d:)", i+origin);
else
sprintf(str, ":%d:@", i+origin);
snprintf(str, 128, ":%d:@", i+origin);
base_string += str;
}
for (i = 1 ; i < nlevels ; i++)
{
sprintf(str, "(n/%d)", numbelow[i]);
snprintf(str, 128, "(n/%d)", numbelow[i]);
base_string += str;
if (i != (nlevels-1))
base_string += "?(";
Expand All @@ -855,17 +858,17 @@ avtMeshMetaData::SetAMRInfo(const std::string &levelName,
for (i = nlevels-1 ; i >= 0 ; i--)
{
if (i == (nlevels-1))
sprintf(str, "n+%d-%d", origin, numbelow[i]);
snprintf(str, 128, "n+%d-%d", origin, numbelow[i]);
else if (i > 0)
sprintf(str, ":n+%d-%d:)", origin, numbelow[i]);
snprintf(str, 128, ":n+%d-%d:)", origin, numbelow[i]);
else
sprintf(str, ":n+%d:", origin);
snprintf(str, 128, ":n+%d:", origin);
base_string += str;
}
if (nlevels <= 1)
{
// logic above doesn't work for nlevels == 1, just override
sprintf(str, "@%s%d,%s%%d@n+%d:", levelName.c_str(), origin,
snprintf(str, 128, "@%s%d,%s%%d@n+%d:", levelName.c_str(), origin,
patchName.c_str(), origin);
base_string = str;
}
Expand All @@ -874,4 +877,3 @@ avtMeshMetaData::SetAMRInfo(const std::string &levelName,
atts.SetNamescheme(base_string);
this->blockNameScheme = atts;
}

7 changes: 6 additions & 1 deletion src/avt/DBAtts/SIL/avtSILMatrix.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,11 @@ avtSILMatrix::Print(ostream &out) const
// Programmer: Hank Childs
// Creation: November 14, 2002
//
// Modifications:
//
// Cyrus Harrison, Mon Jul 21 11:09:11 PDT 2025
// sprintf to snprintf
//
// ****************************************************************************

avtSILSet_p
Expand All @@ -230,7 +235,7 @@ avtSILMatrix::GetSILSet(int index) const
avtSILSet_p s1 = sil->GetSILSet(set1[row]);
avtSILSet_p s2 = sil->GetSILSet(set2[column]);
char name[1024];
sprintf(name, "%s, %s", s1->GetName().c_str(), s2->GetName().c_str());
snprintf(name, 1024, "%s, %s", s1->GetName().c_str(), s2->GetName().c_str());

avtSILSet_p rv = new avtSILSet(name, s1->GetIdentifier());

Expand Down
7 changes: 5 additions & 2 deletions src/avt/DataBinning/avtDataBinning.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,9 @@ avtDataBinning::ApplyFunction(vtkDataSet *ds)
// Fixed bug with output for 1D grids. For each curve(grid) point we do
// have a correspdong bin value. We don't need to average grid points.
//
// Cyrus Harrison, Mon Jul 21 11:09:11 PDT 2025
// sprintf to snprintf
//
// ****************************************************************************

void
Expand All @@ -330,7 +333,7 @@ avtDataBinning::OutputDataBinning(const std::string &ddfname)
{
vtkDataSetWriter *wrtr = vtkDataSetWriter::New();
char str[1024];
sprintf(str, "%s.vtk", ddfname.c_str());
snprintf(str, 1024, "%s.vtk", ddfname.c_str());
wrtr->SetFileName(str);
wrtr->SetInputData(g);
wrtr->Write();
Expand All @@ -344,7 +347,7 @@ avtDataBinning::OutputDataBinning(const std::string &ddfname)
vtkDataArray *s = r->GetPointData()->GetArray(0);
vtkDataArray *x = r->GetXCoordinates();
char str[1024];
sprintf(str, "%s.ultra", ddfname.c_str());
snprintf(str, 1024, "%s.ultra", ddfname.c_str());
ofstream ofile(str);
ofile << "# DataBinning " << ddfname << endl;
for (int j = 0 ; j < dims[0] ; j++)
Expand Down
19 changes: 13 additions & 6 deletions src/avt/Database/Database/avtDatabase.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,9 @@ avtDatabase::GetOutput(const char *var, int ts)
// Brad Whitlock, Fri Jun 16 14:43:44 PDT 2023
// Make invalidating nodes/zones for data selections conditional.
//
// Cyrus Harrison, Mon Jul 21 11:09:11 PDT 2025
// sprintf to snprintf
//
// ****************************************************************************

void
Expand Down Expand Up @@ -1126,7 +1129,7 @@ avtDatabase::PopulateDataObjectInformation(avtDataObject_p &dob,
}

char str[1024];
sprintf(str, "Populating Information for %s", var);
snprintf(str, 1024, "Populating Information for %s", var);
visitTimer->StopTimer(timerHandle, str);
visitTimer->DumpTimings();
}
Expand Down Expand Up @@ -1454,6 +1457,10 @@ avtDatabase::Convert1DVarMDsToCurveMDs(avtDatabaseMetaData *md)
//
// Eddie Rusu, Wed May 6 15:43:52 PDT 2020
// Added newer mesh quality metrics.
//
// Cyrus Harrison, Mon Jul 21 11:09:11 PDT 2025
// sprintf to snprintf
//
// ****************************************************************************

void
Expand Down Expand Up @@ -1552,16 +1559,16 @@ avtDatabase::AddMeshQualityExpressions(avtDatabaseMetaData *md)
Expression new_expr;
char buff[1024];
if (nmeshes == 1)
sprintf(buff, "mesh_quality/%s", exprs[j].mq_expr.c_str());
snprintf(buff, 1024, "mesh_quality/%s", exprs[j].mq_expr.c_str());
else
sprintf(buff, "mesh_quality/%s/%s", name.c_str(),
snprintf(buff, 1024, "mesh_quality/%s/%s", name.c_str(),
exprs[j].mq_expr.c_str());
new_expr.SetName(buff);
bool hasSlash = (strstr(name.c_str(), "/") != NULL);
if (hasSlash)
sprintf(buff,"%s(<%s>)",exprs[j].mq_expr.c_str(),name.c_str());
snprintf(buff, 1024, "%s(<%s>)",exprs[j].mq_expr.c_str(),name.c_str());
else
sprintf(buff,"%s(%s)",exprs[j].mq_expr.c_str(),name.c_str());
snprintf(buff, 1024, "%s(%s)",exprs[j].mq_expr.c_str(),name.c_str());
new_expr.SetDefinition(buff);
new_expr.SetType(Expression::ScalarMeshVar);
new_expr.SetAutoExpression(true);
Expand Down Expand Up @@ -2497,7 +2504,7 @@ avtDatabase::GetFileListFromTextFile(const char *textfile,
}
else
{
sprintf(str_with_dir, "%s%s", dir, str_auto);
snprintf(str_with_dir, 2048, "%s%s", dir, str_auto);
}
char *str_heap = CXX_strdup(str_with_dir);
list.push_back(str_heap);
Expand Down
Loading