Changes in uspace/srv/net/app/parse.c [aadf01e:21580dd] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/app/parse.c
raadf01e r21580dd 42 42 #include "parse.h" 43 43 44 int parse_parameter_int( int argc, char ** argv, int * index, int * value, const char * name, int offset){45 char * 44 int parse_parameter_int( int argc, char ** argv, int * index, int * value, const char * name, int offset ){ 45 char * rest; 46 46 47 if( offset){48 * value = strtol(argv[*index] + offset, &rest, 10);49 }else if(( *index) + 1 < argc){50 ++ ( *index);51 * value = strtol(argv[*index], &rest, 10);47 if( offset ){ 48 * value = strtol( argv[ * index ] + offset, & rest, 10 ); 49 }else if(( * index ) + 1 < argc ){ 50 ++ ( * index ); 51 * value = strtol( argv[ * index ], & rest, 10 ); 52 52 }else{ 53 fprintf( stderr, "Command line error: missing %s\n", name);53 fprintf( stderr, "Command line error: missing %s\n", name ); 54 54 return EINVAL; 55 55 } 56 if( rest && (*rest)){57 fprintf( stderr, "Command line error: %s unrecognized (%d: %s)\n", name, * index, argv[*index]);56 if( rest && ( * rest )){ 57 fprintf( stderr, "Command line error: %s unrecognized (%d: %s)\n", name, * index, argv[ * index ] ); 58 58 return EINVAL; 59 59 } … … 61 61 } 62 62 63 int parse_parameter_string( int argc, char ** argv, int * index, char ** value, const char * name, int offset){64 if( offset){65 * value = argv[*index] + offset;66 }else if(( *index) + 1 < argc){67 ++ ( *index);68 * value = argv[*index];63 int parse_parameter_string( int argc, char ** argv, int * index, char ** value, const char * name, int offset ){ 64 if( offset ){ 65 * value = argv[ * index ] + offset; 66 }else if(( * index ) + 1 < argc ){ 67 ++ ( * index ); 68 * value = argv[ * index ]; 69 69 }else{ 70 fprintf( stderr, "Command line error: missing %s\n", name);70 fprintf( stderr, "Command line error: missing %s\n", name ); 71 71 return EINVAL; 72 72 } … … 74 74 } 75 75 76 int parse_parameter_name_int( int argc, char ** argv, int * index, int * value, const char * name, int offset, int (*parse_value)(const char * value)){76 int parse_parameter_name_int( int argc, char ** argv, int * index, int * value, const char * name, int offset, int ( * parse_value )( const char * value )){ 77 77 ERROR_DECLARE; 78 78 79 char * 79 char * parameter; 80 80 81 ERROR_PROPAGATE( parse_parameter_string(argc, argv, index, ¶meter, name, offset));82 * value = (*parse_value)(parameter);83 if(( *value) == ENOENT){84 fprintf( stderr, "Command line error: unrecognized %s value (%d: %s)\n", name, * index, parameter);81 ERROR_PROPAGATE( parse_parameter_string( argc, argv, index, & parameter, name, offset )); 82 * value = ( * parse_value )( parameter ); 83 if(( * value ) == ENOENT ){ 84 fprintf( stderr, "Command line error: unrecognized %s value (%d: %s)\n", name, * index, parameter ); 85 85 return ENOENT; 86 86 } … … 88 88 } 89 89 90 void print_unrecognized( int index, const char * parameter){91 fprintf( stderr, "Command line error - unrecognized parameter (%d: %s)\n", index, parameter);90 void print_unrecognized( int index, const char * parameter ){ 91 fprintf( stderr, "Command line error - unrecognized parameter (%d: %s)\n", index, parameter ); 92 92 } 93 93
Note:
See TracChangeset
for help on using the changeset viewer.