From 9b940e5d012707d31ac88296321b6cadb60bed7c Mon Sep 17 00:00:00 2001
From: Jim Monte <jim.monte01@gmail.com>
Date: Sun, 8 Mar 2020 03:32:56 -0400
Subject: [PATCH] Fixed some minor merging issues

---
 src/frontend/wdisp/windisp.c | 8 +++++---
 src/misc/dstring.c           | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/frontend/wdisp/windisp.c b/src/frontend/wdisp/windisp.c
index 131f91fcb..a321cb29a 100644
--- a/src/frontend/wdisp/windisp.c
+++ b/src/frontend/wdisp/windisp.c
@@ -161,8 +161,9 @@ int WIN_Init(void)
         TheWndClass.cbClsExtra     = 0;
         TheWndClass.cbWndExtra     = sizeof(GRAPH *);
 
-        if (!RegisterClass(&TheWndClass))
+        if (!RegisterClass(&TheWndClass)) {
             return 1;
+        }
 
 #else
         /* register window class */
@@ -179,8 +180,9 @@ int WIN_Init(void)
         TheWndClassW.hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(2));
         TheWndClassW.cbClsExtra = 0;
         TheWndClassW.cbWndExtra = sizeof(GRAPH *);
-        if (!RegisterClassW(&TheWndClassW))
-            return 1;
+        if (!RegisterClassW(&TheWndClassW)) {
+           return 1;
+        }
 #endif
         IsRegistered = 1;
     }
diff --git a/src/misc/dstring.c b/src/misc/dstring.c
index d6e22faaf..05f87b5b8 100644
--- a/src/misc/dstring.c
+++ b/src/misc/dstring.c
@@ -86,7 +86,7 @@ int ds_init(DSTRING *p_ds, char *p_buf, size_t length_string,
 void ds_free(DSTRING *p_ds)
 {
     if (p_ds->p_buf != p_ds->p_stack_buf) {
-        txfree((void *) p_ds->p_buf);
+        free((void *) p_ds->p_buf);
     }
 } /* end of function ds_free */
 
@@ -230,7 +230,7 @@ static int ds_reserve_internal(DSTRING *p_ds,
 
     /* If there already was a dynamic allocation, free it */
     if (p_ds->p_buf != p_ds->p_stack_buf) {
-        txfree((void *) p_ds->p_buf);
+        free((void *) p_ds->p_buf);
     }
 
     /* Assign new active buffer and its size */
@@ -335,7 +335,7 @@ int ds_compact(DSTRING *p_ds)
      * free the allocation. */
     if (p_ds->n_byte_stack_buf >= n_byte_alloc_min) {
         (void) memcpy(p_ds->p_stack_buf, p_ds->p_buf, n_byte_alloc_min);
-        txfree((void *) p_ds->p_buf);
+        free((void *) p_ds->p_buf);
         p_ds->p_buf = p_ds->p_stack_buf;
         p_ds->n_byte_alloc = p_ds->n_byte_stack_buf;
         return DS_E_OK;