the-btfash-foundation/tmux-mem-cpu-load
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Give the MEMORY_MODE enum a name.

Browse Source 
This improves readability. Also, set the default value in one place in the
declaration.
This commit is contained in:
Matt McCormick 2016-02-10 16:47:13 -05:00
parent c5f369ae00
commit 4fd854ce16
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/main.cc
View File

@ -93,7 +93,7 @@ int main( int argc, char** argv )
unsigned cpu_usage_delay = 990000; unsigned cpu_usage_delay = 990000;
short graph_lines = 10; // max 32767 should be enough short graph_lines = 10; // max 32767 should be enough
bool use_colors = false; bool use_colors = false;
int mem_mode = MEMORY_MODE_DEFAULT; MEMORY_MODE mem_mode = MEMORY_MODE_DEFAULT;
static struct option long_options[] = static struct option long_options[] =
{ {
@ -143,7 +143,7 @@ int main( int argc, char** argv )
std::cerr << "Memory mode argument must be zero or greater.\n"; std::cerr << "Memory mode argument must be zero or greater.\n";
return EXIT_FAILURE; return EXIT_FAILURE;
} }
mem_mode = atoi( optarg ); mem_mode = static_cast< MEMORY_MODE >( atoi( optarg ) );
break; break;
case '?': case '?':
// getopt_long prints error message automatically // getopt_long prints error message automatically

5
common/memory.h
View File

@ -21,13 +21,14 @@
#include <string> #include <string>
enum enum MEMORY_MODE
{ {
MEMORY_MODE_DEFAULT, MEMORY_MODE_DEFAULT,
MEMORY_MODE_FREE_MEMORY, MEMORY_MODE_FREE_MEMORY,
MEMORY_MODE_USAGE_PERCENTAGE MEMORY_MODE_USAGE_PERCENTAGE
}; };
std::string mem_string( bool, int ); std::string mem_string( bool,
MEMORY_MODE mode = MEMORY_MODE_DEFAULT );
#endif #endif

2
freebsd/memory.cc
View File

@ -29,7 +29,7 @@
#include "luts.h" #include "luts.h"
#include "conversions.h" #include "conversions.h"
std::string mem_string( bool use_colors = false, int mode = 0 ) std::string mem_string( bool use_colors = false, MEMORY_MODE mode )
{ {
// These values are in bytes // These values are in bytes
//u_int total; //u_int total;

2
linux/memory.cc
View File

@ -24,7 +24,7 @@
#include "luts.h" #include "luts.h"
#include "conversions.h" #include "conversions.h"
std::string mem_string( bool use_colors = false, int mode = 0 ) std::string mem_string( bool use_colors = false, MEMORY_MODE mode )
{ {
using std::string; using std::string;
using std::ifstream; using std::ifstream;

2
netbsd/memory.cc
View File

@ -28,7 +28,7 @@
#include "conversions.h" #include "conversions.h"
#include "memory.h" #include "memory.h"
std::string mem_string( bool use_colors = false, int mode = 0 ) std::string mem_string( bool use_colors = false, MEMORY_MODE mode )
{ {
std::ostringstream oss; std::ostringstream oss;

2
openbsd/memory.cc
View File

@ -47,7 +47,7 @@ static int pageshift;
#endif #endif
#define pagesh(size) ((size) << pageshift) #define pagesh(size) ((size) << pageshift)
std::string mem_string( bool use_colors = false, int mode = 0 ) std::string mem_string( bool use_colors = false, MEMORY_MODE mode )
{ {
std::ostringstream oss; std::ostringstream oss;

2
osx/memory.cc
View File

@ -25,7 +25,7 @@
#include "luts.h" #include "luts.h"
#include "conversions.h" #include "conversions.h"
std::string mem_string( bool use_colors, int mode ) std::string mem_string( bool use_colors, MEMORY_MODE mode )
{ {
std::ostringstream oss; std::ostringstream oss;