Ticket #11934: 0001-Deskbar-No-need-to-use-dynamic-allocation-remove-unu.2.patch

src/apps/deskbar/ShowHideMenuItem.cpp

@@ -36 +36 @@
 
 #include "ShowHideMenuItem.h"
 
-#include <malloc.h>
-#include <stdio.h>
-#include <strings.h>
-
 #include <Debug.h>
 #include <Roster.h>
 #include <WindowInfo.h>

src/apps/deskbar/TruncatableMenuItem.cpp

@@ -37 +37 @@
 
 #include "TruncatableMenuItem.h"
 
+#include <StackOrHeapArray.h>
+
 #include <stdlib.h>
 
 #include "BarApp.h"
@@ -100 +102 @@
 
     const char* label = Label();
     if (width > 0 && maxWidth > 0 && width > maxWidth) {
-        char* truncatedLabel = (char*)malloc(strlen(label) + 4);
-        if (truncatedLabel != NULL) {
+        BStackOrHeapArray<char, 128> truncatedLabel(strlen(label) + 4);
+        if (truncatedLabel.IsValid()) {
             float labelWidth = menu->StringWidth(label);
             float offset = width - labelWidth;
             TruncateLabel(maxWidth - offset, truncatedLabel);
             fTruncatedString.SetTo(truncatedLabel);
-            free(truncatedLabel);
             return fTruncatedString.String();
         }
     }

src/apps/deskbar/WindowMenu.cpp

@@ -36 +36 @@
 
 #include "WindowMenu.h"
 
-#include <malloc.h>
-#include <stdio.h>
-#include <strings.h>
-
 #include <Catalog.h>
 #include <Locale.h>
 #include <Window.h>