aboutsummaryrefslogtreecommitdiffstats
path: root/main/strcompat.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-06 00:14:32 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-06 00:14:32 +0000
commitf9f33f16fbad3c7f228791cb1f4e38b4d73ced73 (patch)
tree629fd8245dca6f6351b5dcf9560420dfb221655e /main/strcompat.c
parentc7864bc14b10cc91805378e278f007019dfc7187 (diff)
Merged revisions 105840 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r105840 | tilghman | 2008-03-04 17:04:29 -0600 (Tue, 04 Mar 2008) | 2 lines Whitespace changes only ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106306 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/strcompat.c')
-rw-r--r--main/strcompat.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/main/strcompat.c b/main/strcompat.c
index 37ee407cd..a3f0e1497 100644
--- a/main/strcompat.c
+++ b/main/strcompat.c
@@ -26,27 +26,27 @@
#ifndef HAVE_STRSEP
char *strsep(char **str, const char *delims)
{
- char *token;
-
- if (!*str) {
- /* No more tokens */
- return NULL;
- }
-
- token = *str;
- while (**str != '\0') {
- if (strchr(delims, **str)) {
- **str = '\0';
- (*str)++;
- return token;
- }
- (*str)++;
- }
-
- /* There is no other token */
- *str = NULL;
-
- return token;
+ char *token;
+
+ if (!*str) {
+ /* No more tokens */
+ return NULL;
+ }
+
+ token = *str;
+ while (**str != '\0') {
+ if (strchr(delims, **str)) {
+ **str = '\0';
+ (*str)++;
+ return token;
+ }
+ (*str)++;
+ }
+
+ /* There is no other token */
+ *str = NULL;
+
+ return token;
}
#endif
@@ -185,15 +185,15 @@ int vasprintf(char **strp, const char *fmt, va_list ap)
#if !defined(HAVE_ASPRINTF) && !defined(__AST_DEBUG_MALLOC)
int asprintf(char **str, const char *fmt, ...)
{
- va_list ap;
- int ret;
+ va_list ap;
+ int ret;
- *str = NULL;
- va_start(ap, fmt);
- ret = vasprintf(str, fmt, ap);
- va_end(ap);
+ *str = NULL;
+ va_start(ap, fmt);
+ ret = vasprintf(str, fmt, ap);
+ va_end(ap);
- return ret;
+ return ret;
}
#endif /* !defined(HAVE_ASPRINTF) && !defined(__AST_DEBUG_MALLOC) */