diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-08 21:48:23 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-08 21:48:23 +0000 |
| commit | 6297955c144166d5587cb2631403fa96f215fbfb (patch) | |
| tree | f184d99add48341496ae256d1af368e6a029f0ff /include | |
| parent | fb96e4e89fc31a72b859674b778fba5624690594 (diff) | |
Merged revisions 155516 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r155516 | russell | 2008-11-08 15:46:43 -0600 (Sat, 08 Nov 2008) | 3 lines
- Check for failure when putting the packet in the ast_str
- fix a spelling error in a header file
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155517 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/strings.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h index f6239121a..4e76b3bda 100644 --- a/include/asterisk/strings.h +++ b/include/asterisk/strings.h @@ -548,7 +548,7 @@ struct ast_str *__ast_str_thread_get(struct ast_threadstorage *ts, * interface simplified). */ enum { - /*! An error has occured and the contents of the dynamic string + /*! An error has occurred and the contents of the dynamic string * are undefined */ AST_DYNSTR_BUILD_FAILED = -1, /*! The buffer size for the dynamic string had to be increased, and |