cpp/openttd-patchpack/source Changeset - r7179:5b07232be067

Changeset - r7179:5b07232be067

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 17 years ago 2007-07-06 08:32:00
peter1138@openttd.org

(svn r10453) -Codechange: Allow save/load of empty (unallocated) strings

1 file changed with 8 insertions and 3 deletions:

src/saveload.cpp

0 comments (0 inline, 0 general)

src/saveload.cpp

➞

Show inline comments

@@ @@ -496,6 +496,7 @@ static void SlSaveLoadConv(void *ptr, Va @@
  * @return return the net length of the string */
 static inline size_t SlCalcNetStringLen(const char *ptr, size_t length)
+{
 	if (ptr == NULL) return 0;
 	return minu(strlen(ptr), length - 1);
+}
@@ @@ -573,9 +574,13 @@ static void SlString(void *ptr, size_t l @@
 			case SLE_VAR_STR:
 			case SLE_VAR_STRQ: // Malloc'd string, free previous incarnation, and allocate
 				free(*(char**)ptr);
 				*(char**)ptr = (char*)malloc(len + 1); // terminating '\0'
 				ptr = *(char**)ptr;
 				SlCopyBytes(ptr, len);
 				if (len == 0) {
 					*(char**)ptr = NULL;
 				} else {
 					*(char**)ptr = (char*)malloc(len + 1); // terminating '\0'
 					ptr = *(char**)ptr;
 					SlCopyBytes(ptr, len);
+				}
 				break;
+		}

0 comments (0 inline, 0 general)