alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

more code smells

Browse source 
* bin/common_file.cc, bin/common_file.hh, bin/common_finput.cc,
bin/common_finput.hh, bin/common_output.cc, bin/common_setup.cc,
bin/common_setup.hh, bin/common_trans.cc, bin/common_trans.hh,
bin/dstar2tgba.cc, bin/genaut.cc, bin/genltl.cc, bin/ltl2tgba.cc,
bin/ltl2tgta.cc, bin/ltlcross.cc, bin/ltldo.cc, bin/ltlfilt.cc,
bin/ltlsynt.cc, bin/randltl.cc: Fix minor code issues reported by
sonarcloud.
This commit is contained in:
Alexandre Duret-Lutz 2023-01-06 11:55:34 +01:00
parent 7b0507a950
commit 39212bbcd2
19 changed files with 133 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

46
bin/common_trans.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2015-2022 Laboratoire de Recherche et Développement
// Copyright (C) 2015-2023 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
@ -53,7 +53,7 @@ struct shorthands_t
};
#define SHORTHAND(PRE, POST) { PRE, std::regex("^" PRE), POST }
static shorthands_t shorthands_ltl[] = {
static const shorthands_t shorthands_ltl[] = {
SHORTHAND("delag", " %f>%O"),
SHORTHAND("lbt", " <%L>%O"),
SHORTHAND("ltl2ba", " -f %s>%O"),
@ -73,7 +73,7 @@ static shorthands_t shorthands_ltl[] = {
SHORTHAND("owl.* ltl-utilities\\b", " -f %f"),
};
static shorthands_t shorthands_autproc[] = {
static const shorthands_t shorthands_autproc[] = {
SHORTHAND("autfilt", " %H>%O"),
SHORTHAND("dra2dpa", " <%H>%O"),
SHORTHAND("dstar2tgba", " %H>%O"),
@ -85,7 +85,7 @@ static shorthands_t shorthands_autproc[] = {
" <%H>%O"),
};
static void show_shorthands(shorthands_t* begin, shorthands_t* end)
static void show_shorthands(const shorthands_t* begin, const shorthands_t* end)
{
std::cout
<< ("If a COMMANDFMT does not use any %-sequence, and starts with one of\n"
@ -100,7 +100,8 @@ static void show_shorthands(shorthands_t* begin, shorthands_t* end)
}
tool_spec::tool_spec(const char* spec, shorthands_t* begin, shorthands_t* end,
tool_spec::tool_spec(const char* spec,
const shorthands_t* begin, const shorthands_t* end,
bool is_ref) noexcept
: spec(spec), cmd(spec), name(spec), reference(is_ref)
{
@ -113,15 +114,15 @@ tool_spec::tool_spec(const char* spec, shorthands_t* begin, shorthands_t* end,
{
if (*pos == '{')
++count;
else if (*pos == '}')
if (!--count)
{
name = strndup(cmd + 1, pos - cmd - 1);
cmd = pos + 1;
while (*cmd == ' ' || *cmd == '\t')
++cmd;
break;
}
else if (*pos == '}' && --count == 0)
{
name = strndup(cmd + 1, pos - cmd - 1);
cmd = pos + 1;
// skip leading whitespace
while (*cmd == ' ' || *cmd == '\t')
++cmd;
break;
}
}
}
// If there is no % in the string, look for a known
@ -147,11 +148,11 @@ tool_spec::tool_spec(const char* spec, shorthands_t* begin, shorthands_t* end,
auto& p = *begin++;
if (std::regex_search(basename, p.rprefix))
{
int m = strlen(p.suffix);
int q = strlen(cmd);
size_t m = strlen(p.suffix);
size_t q = strlen(cmd);
char* tmp = static_cast<char*>(malloc(q + m + 1));
strcpy(tmp, cmd);
strcpy(tmp + q, p.suffix);
memcpy(tmp, cmd, q);
memcpy(tmp + q, p.suffix, m + 1);
cmd = tmp;
allocated = true;
break;
@ -490,9 +491,8 @@ read_stdout_of_command(char* const* args)
if (close(cout_pipe[1]) < 0)
error(2, errno, "closing write-side of pipe failed");
std::string buffer(32, 0);
std::string results;
int bytes_read;
ssize_t bytes_read;
for (;;)
{
static char buffer[512];
@ -612,7 +612,7 @@ get_arg(const char*& cmd)
{
const char* start = cmd;
std::string arg;
while (int c = *cmd)
while (char c = *cmd)
{
switch (c)
{
@ -642,14 +642,14 @@ get_arg(const char*& cmd)
goto end_loop;
case '\'':
{
int d = 0;
char d = '\0';
while ((d = *++cmd))
{
if (d == '\'')
break;
arg.push_back(d);
}
if (d == 0)
if (d == '\0')
return nullptr;
}
break;