[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [5651] Revert r5532, r5536 and a piece of r5531.
From: |
Andrzej Zaborowski |
Subject: |
[Qemu-devel] [5651] Revert r5532, r5536 and a piece of r5531. |
Date: |
Sat, 08 Nov 2008 23:57:26 +0000 |
Revision: 5651
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5651
Author: balrog
Date: 2008-11-08 23:57:26 +0000 (Sat, 08 Nov 2008)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/cutils.c
trunk/hw/bt-hci.c
trunk/qemu-common.h
Modified: trunk/cutils.c
===================================================================
--- trunk/cutils.c 2008-11-08 16:27:07 UTC (rev 5650)
+++ trunk/cutils.c 2008-11-08 23:57:26 UTC (rev 5651)
@@ -50,18 +50,6 @@
return buf;
}
-/* strdup with a limit */
-char *pstrdup(const char *str, size_t buf_size)
-{
- size_t len;
- char *buf;
-
- len = MIN(buf_size, strlen(str));
- buf = qemu_malloc(len);
- pstrcpy(buf, len, str);
- return buf;
-}
-
int strstart(const char *str, const char *val, const char **ptr)
{
const char *p, *q;
Modified: trunk/hw/bt-hci.c
===================================================================
--- trunk/hw/bt-hci.c 2008-11-08 16:27:07 UTC (rev 5650)
+++ trunk/hw/bt-hci.c 2008-11-08 23:57:26 UTC (rev 5651)
@@ -1137,7 +1137,7 @@
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 @@
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, ¶ms, READ_LOCAL_NAME_RP_SIZE);
}
@@ -1815,8 +1815,8 @@
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 @@
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.
Modified: trunk/qemu-common.h
===================================================================
--- trunk/qemu-common.h 2008-11-08 16:27:07 UTC (rev 5650)
+++ trunk/qemu-common.h 2008-11-08 23:57:26 UTC (rev 5651)
@@ -89,7 +89,6 @@
/* cutils.c */
void pstrcpy(char *buf, int buf_size, const char *str);
char *pstrcat(char *buf, int buf_size, const char *s);
-char *pstrdup(const char *str, size_t buf_size);
int strstart(const char *str, const char *val, const char **ptr);
int stristart(const char *str, const char *val, const char **ptr);
time_t mktimegm(struct tm *tm);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [5651] Revert r5532, r5536 and a piece of r5531.,
Andrzej Zaborowski <=