strdup instead of malloc/strcpy

[freeglut] / src / mswin / fg_window_mswin.c

diff --git a/src/mswin/fg_window_mswin.c b/src/mswin/fg_window_mswin.c
index dbc87b1..4365b8c 100644 (file)
--- a/src/mswin/fg_window_mswin.c
+++ b/src/mswin/fg_window_mswin.c
@@ -406,7 +406,6 @@ void fghGetStyleFromWindow( const SFG_Window *window, DWORD *windowStyle, DWORD
     }
 }
 
-
 /* Computes position of corners of window Rect (outer position including
  * decorations) based on the provided client rect and based on the style
  * of the window in question.
@@ -455,7 +454,6 @@ void fghComputeWindowRectFromClientArea_QueryWindow( RECT *clientRect, const SFG
     fghComputeWindowRectFromClientArea_UseStyle(clientRect, windowStyle, windowExStyle, posIsOutside);
 }
 
-
 /* Gets the rect describing the client area (drawable area) of the
  * specified window. Output is position of corners of client area (drawable area) on the screen.
  * Does not touch clientRect if window pointer or window handle is NULL.
@@ -464,7 +462,6 @@ void fghComputeWindowRectFromClientArea_QueryWindow( RECT *clientRect, const SFG
 void fghGetClientArea( RECT *clientRect, const SFG_Window *window )
 {
     POINT topLeftClient = {0,0};
-    POINT topLeftWindow = {0,0};
 
     freeglut_return_if_fail((window && window->Window.Handle));
     
@@ -476,6 +473,7 @@ void fghGetClientArea( RECT *clientRect, const SFG_Window *window )
     OffsetRect(clientRect,topLeftClient.x,topLeftClient.y);
 }
 
+
 #if(WINVER >= 0x500)
 typedef struct
 {
@@ -744,6 +742,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
 
 void fgPlatformDisplayWindow ( SFG_Window *window )
 {
+    /* This immediately generates a WM_PAINT message upon which we call the display callbacks to redraw the window */
     RedrawWindow(
         window->Window.Handle, NULL, NULL,
         RDW_NOERASE | RDW_INTERNALPAINT | RDW_INVALIDATE | RDW_UPDATENOW
@@ -924,8 +923,7 @@ void fgPlatformGlutSetWindowTitle( const char* title )
     /* Make copy of string to refer to later */
     if (fgStructure.CurrentWindow->State.pWState.WindowTitle)
         free(fgStructure.CurrentWindow->State.pWState.WindowTitle);
-    fgStructure.CurrentWindow->State.pWState.WindowTitle = malloc (strlen(title) + 1);
-    strcpy(fgStructure.CurrentWindow->State.pWState.WindowTitle, title);
+    fgStructure.CurrentWindow->State.pWState.WindowTitle = strdup(title);
 }
 
 /*
@@ -936,8 +934,7 @@ void fgPlatformGlutSetIconTitle( const char* title )
     /* Make copy of string to refer to later */
     if (fgStructure.CurrentWindow->State.pWState.IconTitle)
         free(fgStructure.CurrentWindow->State.pWState.IconTitle);
-    fgStructure.CurrentWindow->State.pWState.IconTitle = malloc (strlen(title) + 1);
-    strcpy(fgStructure.CurrentWindow->State.pWState.IconTitle, title);
+    fgStructure.CurrentWindow->State.pWState.IconTitle = strdup(title);
 }
 
 /*