dyndbg: refactor parse_linerange out of ddebug_parse_query
Subsystems (2)
Jim Cromie
maintainerPATCH 8/16 dyndbg: refactor parse_linerange out of ddebug_parse_query
make the code-block reusable to handle "file foo.c:101-200" etc.
Signed-off-by Jim Cromie <[email protected]>
--- lib/dynamic_debug.c | 61 +++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 27 deletions(-)
lib/dynamic_debug.c +34 -27
@@ -277,6 +277,39 @@ static inline int parse_lineno(const char *str, unsigned int *val)return 0 ; } +static int parse_linerange (struct ddebug_query *query,const char *first) +{ +char *last =strchr (first,'-' ); + +if (query->first_lineno || query->last_lineno) { +pr_err ("match-spec: line used 2x\n" ); +return -EINVAL ; + } +if (last) + *last++ ='\0' ; +if (parse_lineno (first, &query->first_lineno) <0 ) +return -EINVAL ; +if (last) { +/* range <first>-<last> */ +if (parse_lineno (last, &query->last_lineno) <0 ) +return -EINVAL ; + +/* special case for last lineno not specified */ +if (query->last_lineno ==0 ) + query->last_lineno =UINT_MAX ; + +if (query->last_lineno < query->first_lineno) { +pr_err ("last-line:%d < 1st-line:%d\n" , + query->last_lineno, + query->first_lineno); +return -EINVAL ; + } + }else { + query->last_lineno = query->first_lineno; + } +return 0 ; +} +static int check_set (const char **dest,char *src,char *name) {int rc =0 ;
@@ -335,34 +368,8 @@ static int ddebug_parse_query(char *words[], int nwords, UNESCAPE_SPECIAL); rc =check_set (&query->format, words[i+1 ],"format" ); }else if (!strcmp (words[i],"line" )) { -char *first = words[i+1 ]; -char *last =strchr (first,'-' ); -if (query->first_lineno || query->last_lineno) { -pr_err ("match-spec: line used 2x\n" ); +if (parse_linerange (query, words[i+1 ]))return -EINVAL ; - } -if (last) - *last++ ='\0' ; -if (parse_lineno (first, &query->first_lineno) <0 ) -return -EINVAL ; -if (last) { -/* range <first>-<last> */ -if (parse_lineno (last, &query->last_lineno) <0 ) -return -EINVAL ; - -/* special case for last lineno not specified */ -if (query->last_lineno ==0 ) - query->last_lineno =UINT_MAX ; - -if (query->last_lineno < query->first_lineno) { -pr_err ("last-line:%d < 1st-line:%d\n" , - query->last_lineno, - query->first_lineno); -return -EINVAL ; - } - }else { - query->last_lineno = query->first_lineno; - } }else {pr_err ("unknown keyword \"%s\"\n" , words[i]);return -EINVAL ;
Signature · 1 line
2.21.0