diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-12-30 12:42:18 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-12-30 12:42:18 -0600 |
| commit | fd95f9ae75acb674be870e3a92c05816bcbbd819 (patch) | |
| tree | d34df38748ca5e93ba645eae411983c56ea5d964 /nuttx/libnx/nxmu | |
| parent | 8ca22c23fa3fa96cf661888f6b8a104d4c1cbd1b (diff) | |
| download | nuttx-fd95f9ae75acb674be870e3a92c05816bcbbd819.tar.gz nuttx-fd95f9ae75acb674be870e3a92c05816bcbbd819.tar.bz2 nuttx-fd95f9ae75acb674be870e3a92c05816bcbbd819.zip | |
NX: Use a consistent allocator in all configurations
Diffstat (limited to 'nuttx/libnx/nxmu')
| -rw-r--r-- | nuttx/libnx/nxmu/nx_connect.c | 4 | ||||
| -rw-r--r-- | nuttx/libnx/nxmu/nx_constructwindow.c | 2 | ||||
| -rw-r--r-- | nuttx/libnx/nxmu/nx_eventhandler.c | 2 | ||||
| -rw-r--r-- | nuttx/libnx/nxmu/nx_openwindow.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/libnx/nxmu/nx_connect.c b/nuttx/libnx/nxmu/nx_connect.c index 7a9241f3b..07cf7a751 100644 --- a/nuttx/libnx/nxmu/nx_connect.c +++ b/nuttx/libnx/nxmu/nx_connect.c @@ -132,7 +132,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname) /* Allocate the NX client structure */ - conn = (FAR struct nxfe_conn_s *)lib_zalloc(sizeof(struct nxfe_conn_s)); + conn = (FAR struct nxfe_conn_s *)lib_uzalloc(sizeof(struct nxfe_conn_s)); if (!conn) { set_errno(ENOMEM); @@ -215,7 +215,7 @@ errout_with_wmq: errout_with_rmq: mq_close(conn->crdmq); errout_with_conn: - lib_free(conn); + lib_ufree(conn); errout: return NULL; } diff --git a/nuttx/libnx/nxmu/nx_constructwindow.c b/nuttx/libnx/nxmu/nx_constructwindow.c index 76e038202..677706e18 100644 --- a/nuttx/libnx/nxmu/nx_constructwindow.c +++ b/nuttx/libnx/nxmu/nx_constructwindow.c @@ -117,7 +117,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd, if (!conn || !cb) { - lib_free(wnd); + lib_ufree(wnd); set_errno(EINVAL); return ERROR; } diff --git a/nuttx/libnx/nxmu/nx_eventhandler.c b/nuttx/libnx/nxmu/nx_eventhandler.c index 26d7f9dee..338f5de4e 100644 --- a/nuttx/libnx/nxmu/nx_eventhandler.c +++ b/nuttx/libnx/nxmu/nx_eventhandler.c @@ -99,7 +99,7 @@ static inline void nx_disconnected(FAR struct nxfe_conn_s *conn) /* And free the client structure */ - lib_free(conn); + lib_ufree(conn); } /**************************************************************************** diff --git a/nuttx/libnx/nxmu/nx_openwindow.c b/nuttx/libnx/nxmu/nx_openwindow.c index d09a329ad..5100a3b9a 100644 --- a/nuttx/libnx/nxmu/nx_openwindow.c +++ b/nuttx/libnx/nxmu/nx_openwindow.c @@ -105,7 +105,7 @@ NXWINDOW nx_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb, /* Pre-allocate the window structure */ - wnd = (FAR struct nxbe_window_s *)lib_zalloc(sizeof(struct nxbe_window_s)); + wnd = (FAR struct nxbe_window_s *)lib_uzalloc(sizeof(struct nxbe_window_s)); if (!wnd) { set_errno(ENOMEM); |