|
Check-in Number:
|
1740 | |
| Date: |
2002-Jan-31 14:34:13 (local)
2002-Jan-31 13:34:13 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
str_concat included the terminating NUL in copy and added a useless NUL |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/str/Makefile.in 1.40 -> 1.41
--- Makefile.in 2002/01/02 17:09:13 1.40
+++ Makefile.in 2002/01/31 13:34:13 1.41
@@ -189,7 +189,7 @@
$(OBJS): Makefile
# AUTOMATICALLY GENERATED DEPENDENCY LIST - DO NOT EDIT
-str_pcre.o: str_pcre.c str_pcre.h str_pcre_tab.c
+str_pcre.o: str_pcre.c str_pcre.h str_pcre.tab
str_memory.o: str_memory.c str_p.h str.h str_config.h str_pcre.h
str_basic.o: str_basic.c str_p.h str.h str_config.h str_pcre.h
str_search.o: str_search.c str_p.h str.h str_config.h str_pcre.h
|
|
ossp-pkg/str/str_basic.c 1.9 -> 1.10
--- str_basic.c 2002/01/02 17:09:13 1.9
+++ str_basic.c 2002/01/31 13:34:13 1.10
@@ -144,12 +144,12 @@
/* concatenate the strings */
ds = rv;
- while ((*ds++ = *s++) != NUL)
- /*nop*/;
- while ((cp = va_arg(ap, char *)) != NULL)
- while ((*ds++ = *cp++) != NUL)
- /*nop*/;
- *ds = NUL;
+ while ((*ds = *s++) != NUL)
+ ds++;
+ while ((cp = va_arg(ap, char *)) != NULL) {
+ while ((*ds = *cp++) != NUL)
+ ds++;
+ }
/* return target string */
return rv;
|
|
