Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 288822
b: refs/heads/master
c: 07100be
h: refs/heads/master
v: v3
  • Loading branch information
Jim Cromie authored and Greg Kroah-Hartman committed Jan 24, 2012
1 parent 5c7e208 commit a0ccf02
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 524b6c5b39b931311dfe5a2f5abae2f5c9731676
refs/heads/master: 07100be7e0495ff39237d48886bca7396c873db7
16 changes: 9 additions & 7 deletions trunk/lib/dynamic_debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
if (!*buf)
break; /* oh, it was trailing whitespace */

/* Run `end' over a word, either whitespace separated or quoted */
/* find `end' of word, whitespace separated or quoted */
if (*buf == '"' || *buf == '\'') {
int quote = *buf++;
for (end = buf ; *end && *end != quote ; end++)
Expand All @@ -199,8 +199,8 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
;
BUG_ON(end == buf);
}
/* Here `buf' is the start of the word, `end' is one past the end */

/* `buf' is start of word, `end' is one past its end */
if (nwords == maxwords)
return -EINVAL; /* ran out of words[] before bytes */
if (*end)
Expand Down Expand Up @@ -452,7 +452,8 @@ static char *dynamic_emit_prefix(const struct _ddebug *desc, char *buf)
pos += snprintf(buf + pos, remaining(pos), "%s:",
desc->function);
if (desc->flags & _DPRINTK_FLAGS_INCL_LINENO)
pos += snprintf(buf + pos, remaining(pos), "%d:", desc->lineno);
pos += snprintf(buf + pos, remaining(pos), "%d:",
desc->lineno);
if (pos - pos_after_tid)
pos += snprintf(buf + pos, remaining(pos), " ");
if (pos >= PREFIX_SIZE)
Expand Down Expand Up @@ -708,10 +709,11 @@ static const struct seq_operations ddebug_proc_seqops = {
};

/*
* File_ops->open method for <debugfs>/dynamic_debug/control. Does the seq_file
* setup dance, and also creates an iterator to walk the _ddebugs.
* Note that we create a seq_file always, even for O_WRONLY files
* where it's not needed, as doing so simplifies the ->release method.
* File_ops->open method for <debugfs>/dynamic_debug/control. Does
* the seq_file setup dance, and also creates an iterator to walk the
* _ddebugs. Note that we create a seq_file always, even for O_WRONLY
* files where it's not needed, as doing so simplifies the ->release
* method.
*/
static int ddebug_proc_open(struct inode *inode, struct file *file)
{
Expand Down

0 comments on commit a0ccf02

Please sign in to comment.