nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

Fix compilation warnings

Browse Source
This commit is contained in:
Danny Robson 2013-02-27 15:11:05 +11:00
parent d17f55cba8
commit a64df2677c
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -55,8 +55,8 @@ AS_CXX_COMPILER_FLAG([-Wsign-conversion], [WARNING_FLAGS="$WARNING_FLAGS -Wsig
AS_CXX_COMPILER_FLAG([-Wtype-limits], [WARNING_FLAGS="$WARNING_FLAGS -Wtype-limits"]) AS_CXX_COMPILER_FLAG([-Wtype-limits], [WARNING_FLAGS="$WARNING_FLAGS -Wtype-limits"])
AS_CXX_COMPILER_FLAG([-Wfloat-equal], [WARNING_FLAGS="$WARNING_FLAGS -Wfloat-equal"]) AS_CXX_COMPILER_FLAG([-Wfloat-equal], [WARNING_FLAGS="$WARNING_FLAGS -Wfloat-equal"])
#AS_CXX_COMPILER_FLAG([-Wswitch-default], [COMMON_CFLAGS="$COMMON_CFLAGS -Wswitch-default"]) AS_CXX_COMPILER_FLAG([-Wswitch-default], [COMMON_CFLAGS="$COMMON_CFLAGS -Wswitch-default"])
AS_CXX_COMPILER_FLAG([-Wswitch-enum], [COMMON_CFLAGS="$COMMON_CFLAGS -Wswitch-enum"]) #AS_CXX_COMPILER_FLAG([-Wswitch-enum], [COMMON_CFLAGS="$COMMON_CFLAGS -Wswitch-enum"])
#AS_CXX_COMPILER_FLAG([-Wzero-as-null-pointer-constant], [WARNING_FLAGS="$WARNING_FLAGS -Wzero-as-null-pointer-constant"]) #AS_CXX_COMPILER_FLAG([-Wzero-as-null-pointer-constant], [WARNING_FLAGS="$WARNING_FLAGS -Wzero-as-null-pointer-constant"])

33
options.cpp
View File

@ -137,7 +137,7 @@ bytesoption::bytesoption (char _letter,
bytestype _type, bytestype _type,
bytesmodifier _modifier, bytesmodifier _modifier,
bool _required): bool _required):
valueoption<size_t> (_letter, _name, _desc, _data), valueoption<size_t> (_letter, _name, _desc, _data, _required),
m_type (_type), m_type (_type),
m_modifier (_modifier) m_modifier (_modifier)
{ ; } { ; }
@ -169,9 +169,10 @@ bytesoption::type_from_character (char c) {
case 'k': case 'k':
case 'K': case 'K':
return BYTES_KILO; return BYTES_KILO;
}
throw domain_error("Invalid magnitude specifier"); default:
throw domain_error("Invalid magnitude specifier");
}
} }
@ -185,19 +186,21 @@ bytesoption::execute (const std::string& data) {
try { try {
bytesmodifier modifier = m_modifier; bytesmodifier modifier = m_modifier;
off_t cursor = data.size () - 1; size_t cursor = data.size () - 1;
// Consume an optional trailing `byte' type // Consume an optional trailing `byte' type
if (data[cursor] == 'B' || data[cursor] == 'b') { if (data[cursor] == 'B' || data[cursor] == 'b') {
if (--cursor < 0) if (cursor == 0)
throw invalid_argument ("Size is too short"); throw invalid_argument ("Size is too short");
--cursor;
} }
// Check if we explicitly request base2 // Check if we explicitly request base2
if (data[cursor] == 'i') { if (data[cursor] == 'i') {
modifier = BYTES_BASE2; modifier = BYTES_BASE2;
if (--cursor < 0) if (cursor == 0)
throw invalid_argument("Size is too short"); throw invalid_argument("Size is too short");
--cursor;
} }
// Determine what constant factor is needed for the raw size // Determine what constant factor is needed for the raw size
@ -213,7 +216,7 @@ bytesoption::execute (const std::string& data) {
break; break;
default: default:
abort (); unreachable ();
} }
// Find the difference in magnitude between what is desired, and what // Find the difference in magnitude between what is desired, and what
@ -234,7 +237,6 @@ bytesoption::execute (const std::string& data) {
// ... so that we can easily decrement the cursor without special logic // ... so that we can easily decrement the cursor without special logic
// after reading the specifiers. // after reading the specifiers.
--cursor; --cursor;
assert (cursor >= 0);
multiplier = std::pow (modifier_factor, (int)specified); multiplier = std::pow (modifier_factor, (int)specified);
get_arg (data.substr(0, cursor + 1), m_data); get_arg (data.substr(0, cursor + 1), m_data);
@ -399,10 +401,11 @@ processor::parse_long (int pos, int argc, const char ** argv) {
arg += 2; arg += 2;
// If there's an equals it's has a value to extract // If there's an equals it's has a value to extract
const char * data = strchr (arg, '='); const char *data = strchr (arg, '=');
if (data) { if (data) {
arg = strndup (arg, data - arg); // Copy just the arg name arg = strndup (arg, sign_cast<size_t> (data - arg));
data++; // Skip the '=' //arg = strndup (arg, data - arg); // Copy just the arg name
++data; // Skip the '='
} }
option *o = m_longopt[arg]; option *o = m_longopt[arg];
@ -445,7 +448,7 @@ processor::parse_args (int argc, const char ** argv) {
const unsigned int FIRST_ARGUMENT = 1; const unsigned int FIRST_ARGUMENT = 1;
try { try {
for (int i = FIRST_ARGUMENT; i < argc; ++i) { for (size_t i = FIRST_ARGUMENT; i < sign_cast<unsigned> (argc); ++i) {
// An argument must begin with a dash, if not we've reached the // An argument must begin with a dash, if not we've reached the
// end of the argument lists or we have a parsing error. // end of the argument lists or we have a parsing error.
if (argv[i][0] != '-') if (argv[i][0] != '-')
@ -548,7 +551,7 @@ processor::remove_option (const char *name) {
/* Parse args from a stream, one arg per line /* Parse args from a stream, one arg per line
*/ */
void parse_stream (std::istream & is) { //void parse_stream (std::istream & is) {
unique_ptr<char[]> buffer (new char [MAX_CHUNK_LENGTH + 1]); // unique_ptr<char[]> buffer (new char [MAX_CHUNK_LENGTH + 1]);
} //}