diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:06:48 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:07:11 +0300 |
commit | 6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0 (patch) | |
tree | 09a6acada909bd5d070ace54209cadeae66d15cf /subopt-helper.c | |
parent | e306174952d42e1cd6cc5efc50ae6bb0410501bc (diff) | |
parent | eafe5b7517bbf408ae1ffc936a3abe2313c3b334 (diff) | |
download | mpv-6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0.tar.bz2 mpv-6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0.tar.xz |
Merge svn changes up to r29304
Diffstat (limited to 'subopt-helper.c')
-rw-r--r-- | subopt-helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/subopt-helper.c b/subopt-helper.c index 6f4bcf6a30..50283cfbf3 100644 --- a/subopt-helper.c +++ b/subopt-helper.c @@ -1,4 +1,4 @@ -/** +/** * \file subopt-helper.c * * \brief Compensates the suboption parsing code duplication a bit. @@ -69,7 +69,7 @@ int subopt_parse( char const * const str, const opt_t * opts ) { char * delim, * arg_delim; - /* search nearest delimiter ( option or argument delimiter ) */ + /* search nearest delimiter ( option or argument delimiter ) */ delim = strchr( &str[parse_pos], ':' ); arg_delim = strchr( &str[parse_pos], '=' ); @@ -78,7 +78,7 @@ int subopt_parse( char const * const str, const opt_t * opts ) { delim = strchr( &str[parse_pos], '=' ); } - + substr_len = delim ? // is a delim present delim - &str[parse_pos] : // yes strlen( &str[parse_pos] ); // no, end of string @@ -204,7 +204,7 @@ else if ( substr_len == opt_len+2 ) /* break out of the loop, if this subopt is processed */ if ( next ) { break; } } - + /* if we had a valid suboption the current pos should * * equal the delimiter char, which should be ':' for * * suboptions. */ |