diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:20:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:20:57 +0200 |
| commit | fd2c17e1777d46cff14c25ea774a4d17459d188a (patch) | |
| tree | e8299216de8e99418195ba64bcf8f679df3a66b3 /include/linux/parser.h | |
| parent | 74e411cb6443d8bcb55fbe89fcc7a9ee574df91b (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/timers
Diffstat (limited to 'include/linux/parser.h')
| -rw-r--r-- | include/linux/parser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/parser.h b/include/linux/parser.h index 26b2bdfcaf0..7dcd0507575 100644 --- a/include/linux/parser.h +++ b/include/linux/parser.h @@ -29,5 +29,5 @@ int match_token(char *, match_table_t table, substring_t args[]); int match_int(substring_t *, int *result); int match_octal(substring_t *, int *result); int match_hex(substring_t *, int *result); -void match_strcpy(char *, const substring_t *); +size_t match_strlcpy(char *, const substring_t *, size_t); char *match_strdup(const substring_t *); |