From 1334ab472129e9ac0ca2408ebb8ed01f336f35b4 Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Tue, 1 Nov 2005 01:57:52 +0000 Subject: [PATCH] just some work, made sure to preserve app_server coding style git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14608 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/ServerApp.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/servers/app/ServerApp.cpp b/src/servers/app/ServerApp.cpp index 47046bc53e..a828e889b8 100644 --- a/src/servers/app/ServerApp.cpp +++ b/src/servers/app/ServerApp.cpp @@ -1323,7 +1323,9 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link) char *stringArray[numStrings]; for (int32 i = 0; i < numStrings; i++) { link.Read(&lengthArray[i]); +#ifdef DE_OLD_READ_STRING stringArray[i] = new char[lengthArray[i]]; +#endif link.ReadString(&stringArray[i]); } @@ -1351,9 +1353,15 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link) fLink.StartMessage(SERVER_FALSE); fLink.Flush(); +#ifndef DE_NEW_READ_STRING for (int32 i = 0; i < numStrings; i++) { - delete[] stringArray[i]; +#ifndef DE_OLD_READ_STRING + free(stringArray[i]); +#else + delete[] stringArray[i]; +#endif } +#endif break; } case AS_GET_FONT_BOUNDING_BOX: