bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Automated merge with file:///home/zander/00-projects/17-bigv/new-trial/src/incoming/flexnbd-c

Browse Source
This commit is contained in:
nick
2013-02-06 12:17:40 +00:00
parent f002b8ca1f 184a13bc9f
commit 2dd3db95bc
6 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile Normal file
View File

@@ -0,0 +1,10 @@
#!/usr/bin/make -f
all:
rake build
all-debug:
DEBUG=1 rake build
clean:
rake clean

2
src/client.c
View File

@@ -25,7 +25,7 @@ struct client *client_create( struct server *serve, int socket )
struct client *c;
c = xmalloc( sizeof( struct server ) );
c = xmalloc( sizeof( struct client ) );
c->stopped = 0;
c->socket = socket;
c->serve = serve;

12
src/mode.c
View File

@@ -215,7 +215,7 @@ void read_serve_param( int c, char **ip_addr, char **ip_port, char **file, char
*default_deny = 1;
break;
case 'q':
log_level = 4;
log_level = QUIET_LOG_LEVEL;
break;
case 'v':
log_level = VERBOSE_LOG_LEVEL;
@@ -255,7 +255,7 @@ void read_listen_param( int c,
*default_deny = 1;
break;
case 'q':
log_level = 4;
log_level = QUIET_LOG_LEVEL;
break;
case 'v':
log_level = VERBOSE_LOG_LEVEL;
@@ -289,7 +289,7 @@ void read_readwrite_param( int c, char **ip_addr, char **ip_port, char **bind_ad
*bind_addr = optarg;
break;
case 'q':
log_level = 4;
log_level = QUIET_LOG_LEVEL;
break;
case 'v':
log_level = VERBOSE_LOG_LEVEL;
@@ -311,7 +311,7 @@ void read_sock_param( int c, char **sock, char *help_text )
*sock = optarg;
break;
case 'q':
log_level = 4;
log_level = QUIET_LOG_LEVEL;
break;
case 'v':
log_level = VERBOSE_LOG_LEVEL;
@@ -356,7 +356,7 @@ void read_mirror_param(
*bind_addr = optarg;
break;
case 'q':
log_level = 4;
log_level = QUIET_LOG_LEVEL;
break;
case 'v':
log_level = VERBOSE_LOG_LEVEL;
@@ -378,7 +378,7 @@ void read_break_param( int c, char **sock )
*sock = optarg;
break;
case 'q':
log_level = 4;
log_level = QUIET_LOG_LEVEL;
break;
case 'v':
log_level = VERBOSE_LOG_LEVEL;

2
src/mode.h
View File

@@ -66,6 +66,8 @@ void mode(char* mode, int argc, char **argv);
# define VERBOSE_LOG_LEVEL 1
#endif
#define QUIET_LOG_LEVEL 4
#define OPT_QUIET "quiet"
#define SOPT_QUIET "q"
#define GETOPT_QUIET GETOPT_FLAG( OPT_QUIET, 'q' )