Skip to content
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

respecting nodiscard for fscanf #3214

Merged
merged 2 commits into from
Jul 9, 2019
Merged

respecting nodiscard for fscanf #3214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bffd24
respecting nodiscard for fscanf
kunaltyagi Jul 8, 2019
c292adb
Added mitigation for clang-tidy
kunaltyagi Jul 9, 2019
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
35 changes: 19 additions & 16 deletions ml/src/svm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3258,63 +3258,63 @@ svm_model *svm_load_model (const char *model_file_name)
}
else
if (res > 0 && strcmp (cmd, "degree") == 0)
fscanf (fp, "%d", &param.degree);
res = fscanf (fp, "%d", &param.degree);
else
if (res > 0 && strcmp (cmd, "gamma") == 0)
fscanf (fp, "%lf", &param.gamma);
res = fscanf (fp, "%lf", &param.gamma);
else
if (res > 0 && strcmp (cmd, "coef0") == 0)
fscanf (fp, "%lf", &param.coef0);
res = fscanf (fp, "%lf", &param.coef0);
else
if (res > 0 && strcmp (cmd, "nr_class") == 0)
fscanf (fp, "%d", &model->nr_class);
res = fscanf (fp, "%d", &model->nr_class);
else
if (res > 0 && strcmp (cmd, "total_sv") == 0)
fscanf (fp, "%d", &model->l);
res = fscanf (fp, "%d", &model->l);
else
if (res > 0 && strcmp (cmd, "rho") == 0)
{
int n = model->nr_class * (model->nr_class - 1) / 2;
model->rho = Malloc (double, n);

for (int i = 0;i < n;i++)
fscanf (fp, "%lf", &model->rho[i]);
for (int i = 0;(i < n) && (res > 0);i++)
res = fscanf (fp, "%lf", &model->rho[i]);
}
else
if (res > 0 && strcmp (cmd, "label") == 0)
{
int n = model->nr_class;
model->label = Malloc (int, n);

for (int i = 0;i < n;i++)
fscanf (fp, "%d", &model->label[i]);
for (int i = 0;(i < n) && (res > 0);i++)
res = fscanf (fp, "%d", &model->label[i]);
}
else
if (res > 0 && strcmp (cmd, "probA") == 0)
{
int n = model->nr_class * (model->nr_class - 1) / 2;
model->probA = Malloc (double, n);

for (int i = 0;i < n;i++)
fscanf (fp, "%lf", &model->probA[i]);
for (int i = 0;(i < n) && (res > 0);i++)
res = fscanf (fp, "%lf", &model->probA[i]);
}
else
if (res > 0 && strcmp (cmd, "probB") == 0)
{
int n = model->nr_class * (model->nr_class - 1) / 2;
model->probB = Malloc (double, n);

for (int i = 0;i < n;i++)
fscanf (fp, "%lf", &model->probB[i]);
for (int i = 0;(i < n) && (res > 0);i++)
res = fscanf (fp, "%lf", &model->probB[i]);
}
else
if (res > 0 && strcmp (cmd, "nr_sv") == 0)
{
int n = model->nr_class;
model->nSV = Malloc (int, n);

for (int i = 0;i < n;i++)
fscanf (fp, "%d", &model->nSV[i]);
for (int i = 0;(i < n) && (res > 0);i++)
res = fscanf (fp, "%d", &model->nSV[i]);
}
else
if (res > 0 && strcmp (cmd, "scaling") == 0)
Expand All @@ -3323,7 +3323,9 @@ svm_model *svm_load_model (const char *model_file_name)
int ii = 0;
//char delims[]="\t: ";
model->scaling = Malloc (struct svm_node, 1);
fscanf (fp, "%10000[^\n]", buff);
res = fscanf (fp, "%10000[^\n]", buff);
if (res <= 0)
continue;
idx = strtok (buff, ":");

while (idx != nullptr)
Expand Down Expand Up @@ -3375,6 +3377,7 @@ svm_model *svm_load_model (const char *model_file_name)
free (model);
return nullptr;
}
(void)res; // to inform clang-tidy to ignore the dead-stores
}

// read sv_coef and SV
Expand Down