diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-22 18:15:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-22 18:15:27 -0400 |
| commit | 9919b0127568253b6bec4f681db3cdc2b5978991 (patch) | |
| tree | 333c5db1120ef60f69e51569c4add186b2903dea /src/common/container.c | |
| parent | 64a5a4177f905971d0cf9e28a19180c2ea32b02a (diff) | |
| parent | 2b5ebc70973b1c0dd62201908632733c0953a4ec (diff) | |
| download | tor-9919b0127568253b6bec4f681db3cdc2b5978991.tar tor-9919b0127568253b6bec4f681db3cdc2b5978991.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/common/container.c')
| -rw-r--r-- | src/common/container.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/container.c b/src/common/container.c index 8635409d8..92bfd2ec8 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -337,7 +337,8 @@ smartlist_insert(smartlist_t *sl, int idx, void *val) /** * Split a string <b>str</b> along all occurrences of <b>sep</b>, - * adding the split strings, in order, to <b>sl</b>. + * appending the (newly allocated) split strings, in order, to + * <b>sl</b>. Return the number of strings added to <b>sl</b>. * * If <b>flags</b>&SPLIT_SKIP_SPACE is true, remove initial and * trailing space from each entry. @@ -346,7 +347,7 @@ smartlist_insert(smartlist_t *sl, int idx, void *val) * If <b>flags</b>&SPLIT_STRIP_SPACE is true, strip spaces from each * split string. * - * If max>0, divide the string into no more than <b>max</b> pieces. If + * If <b>max</b>\>0, divide the string into no more than <b>max</b> pieces. If * <b>sep</b> is NULL, split on any sequence of horizontal space. */ int |