From 793a10a2d435cb3e5d52bc06cf0a06191006148a Mon Sep 17 00:00:00 2001
From: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 8 Nov 2008 23:57:26 +0000
Subject: Revert r5532, r5536 and a piece of r5531.

The use of strncat and strndup was correct, pstrcpy and pstrdup wasn't.
I'll try to restore building on non-gnu OSes in a later commit.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5651 c046a42c-6fe2-441c-8c8c-71466251a162
---
 hw/bt-hci.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'hw/bt-hci.c')

diff --git a/hw/bt-hci.c b/hw/bt-hci.c
index 121fabf45..71c12b85f 100644
--- a/hw/bt-hci.c
+++ b/hw/bt-hci.c
@@ -1137,7 +1137,7 @@ static void bt_hci_reset(struct bt_hci_s *hci)
     hci->device.inquiry_scan = 0;
     hci->device.page_scan = 0;
     if (hci->device.lmp_name)
-        qemu_free((void *) hci->device.lmp_name);
+        free((void *) hci->device.lmp_name);
     hci->device.lmp_name = 0;
     hci->device.class[0] = 0x00;
     hci->device.class[1] = 0x00;
@@ -1387,7 +1387,7 @@ static inline void bt_hci_event_complete_read_local_name(struct bt_hci_s *hci)
     params.status = HCI_SUCCESS;
     memset(params.name, 0, sizeof(params.name));
     if (hci->device.lmp_name)
-        pstrcpy(params.name, sizeof(params.name), hci->device.lmp_name);
+        strncpy(params.name, hci->device.lmp_name, sizeof(params.name));
 
     bt_hci_event_complete(hci, &params, READ_LOCAL_NAME_RP_SIZE);
 }
@@ -1815,8 +1815,8 @@ static void bt_submit_hci(struct HCIInfo *info,
         LENGTH_CHECK(change_local_name);
 
         if (hci->device.lmp_name)
-            qemu_free((void *) hci->device.lmp_name);
-        hci->device.lmp_name = pstrdup(PARAM(change_local_name, name),
+            free((void *) hci->device.lmp_name);
+        hci->device.lmp_name = strndup(PARAM(change_local_name, name),
                         sizeof(PARAM(change_local_name, name)));
         bt_hci_event_complete_status(hci, HCI_SUCCESS);
         break;
@@ -2191,7 +2191,7 @@ static void bt_hci_done(struct HCIInfo *info)
     bt_device_done(&hci->device);
 
     if (hci->device.lmp_name)
-        qemu_free((void *) hci->device.lmp_name);
+        free((void *) hci->device.lmp_name);
 
     /* Be gentle and send DISCONNECT to all connected peers and those
      * currently waiting for us to accept or reject a connection request.
-- 
cgit v1.2.3

lass='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/drm-tip/log/?id=906da809c5be30b4c7f32bb6a489fb25ad794878'>root</a>/<a href='/drm-tip/log/drivers?id=906da809c5be30b4c7f32bb6a489fb25ad794878'>drivers</a>/<a href='/drm-tip/log/drivers/net?id=906da809c5be30b4c7f32bb6a489fb25ad794878'>net</a>/<a href='/drm-tip/log/drivers/net/wireless?id=906da809c5be30b4c7f32bb6a489fb25ad794878'>wireless</a>/<a href='/drm-tip/log/drivers/net/wireless/rtl818x.h?id=906da809c5be30b4c7f32bb6a489fb25ad794878'>rtl818x.h</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/drm-tip/log/drivers/net/wireless/rtl818x.h?id=906da809c5be30b4c7f32bb6a489fb25ad794878&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr>
<tr><td><span title='2008-01-28 15:09:35 -0800'>2008-01-28</span></td><td><a href='/drm-tip/commit/drivers/net/wireless/rtl818x.h?id=f653211197f3841f383fa9757ef8ce182c6cf627'>Add rtl8180 wireless driver</a></td><td>Michael Wu</td><td>1</td><td><span class='deletions'>-4</span>/<span class='insertions'>+25</span></td></tr>
<tr><td><span title='2007-10-10 16:52:57 -0700'>2007-10-10</span></td><td><a href='/drm-tip/commit/drivers/net/wireless/rtl818x.h?id=4150c57212ad134765dd78c654a4b9906252b66d'>[PATCH] mac80211: revamp interface and filter configuration</a></td><td>Johannes Berg</td><td>1</td><td><span class='deletions'>-0</span>/<span class='insertions'>+1</span></td></tr>