openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-23 03:44:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

nginx-util: fix issues and cleanup

Browse Source 
* fix regex capture (to conform std)
* fix issues for Clang/libcxx (warnings/includes)
* fix CONFLICTS in the Makefile
* use /bin/sh in host scripts and shellcheck them
* add callback for setting arguments in ubus::call

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
This commit is contained in:
Peter Stadler
2020-05-26 16:21:10 +02:00
parent 5e6b871e9e
commit 2d359a4556
13 changed files with 421 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net/nginx-util/src/px5g.cpp
View File

@@ -118,7 +118,7 @@ auto checkend(const argv_view & argv) -> int
} catch (...) {
auto errmsg = std::string{"checkend error: invalid time "};
errmsg += argv[i];
std::throw_with_nested(std::runtime_error(errmsg.c_str()));
std::throw_with_nested(std::runtime_error(errmsg));
}
seconds = static_cast<time_t>(num);
@@ -126,7 +126,7 @@ auto checkend(const argv_view & argv) -> int
if (num!=static_cast<intmax_t>(seconds)) {
auto errmsg = std::string{"checkend error: time too big "};
errmsg += argv[i];
throw std::runtime_error(errmsg.c_str());
throw std::runtime_error(errmsg);
}
}
}
@@ -174,7 +174,7 @@ void eckey(const argv_view & argv)
if (has_main_option) {
throw std::runtime_error
("eckey error: more than one main option");
} // else:
} //else:
has_main_option = true;
curve = parse_curve(argv[i]);
@@ -223,7 +223,7 @@ void rsakey(const argv_view & argv)
if (has_main_option) {
throw std::runtime_error("rsakey error: more than one keysize");
} // else:
} //else:
has_main_option = true;
try {
@@ -231,7 +231,7 @@ void rsakey(const argv_view & argv)
} catch (...) {
std::string errmsg{"rsakey error: invalid keysize "};
errmsg += argv[i];
std::throw_with_nested(std::runtime_error(errmsg.c_str()));
std::throw_with_nested(std::runtime_error(errmsg));
}
}
}
@@ -264,7 +264,7 @@ void selfsigned(const argv_view & argv)
} catch (...) {
std::string errmsg{"selfsigned error: not a number for -days "};
errmsg += argv[i].substr(4);
std::throw_with_nested(std::runtime_error(errmsg.c_str()));
std::throw_with_nested(std::runtime_error(errmsg));
}
}
@@ -287,7 +287,7 @@ void selfsigned(const argv_view & argv)
} catch (...) {
std::string errmsg{"selfsigned error: invalid keysize "};
errmsg += argv[i].substr(4);
std::throw_with_nested(std::runtime_error(errmsg.c_str()));
std::throw_with_nested(std::runtime_error(errmsg));
}
} else {
throw std::runtime_error("selfsigned error: invalid algorithm");