svn commit: samba r6678 - in branches/SAMBA_3_0/source/python: .
jerry at samba.org
jerry at samba.org
Mon May 9 12:43:12 GMT 2005
Author: jerry
Date: 2005-05-09 12:43:12 +0000 (Mon, 09 May 2005)
New Revision: 6678
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6678
Log:
fix python python after talloc() shakeup
Modified:
branches/SAMBA_3_0/source/python/py_lsa.c
branches/SAMBA_3_0/source/python/py_ntsec.c
branches/SAMBA_3_0/source/python/py_smb.c
branches/SAMBA_3_0/source/python/py_spoolss_drivers_conv.c
branches/SAMBA_3_0/source/python/py_spoolss_printers.c
branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c
branches/SAMBA_3_0/source/python/py_srvsvc.c
branches/SAMBA_3_0/source/python/py_tdb.c
branches/SAMBA_3_0/source/python/py_tdbpack.c
Changeset:
Modified: branches/SAMBA_3_0/source/python/py_lsa.c
===================================================================
--- branches/SAMBA_3_0/source/python/py_lsa.c 2005-05-09 02:31:56 UTC (rev 6677)
+++ branches/SAMBA_3_0/source/python/py_lsa.c 2005-05-09 12:43:12 UTC (rev 6678)
@@ -167,7 +167,7 @@
/* Convert list to char ** array */
num_names = PyList_Size(py_names);
- names = (const char **)talloc(mem_ctx, num_names * sizeof(char *));
+ names = (const char **)_talloc(mem_ctx, num_names * sizeof(char *));
for (i = 0; i < num_names; i++) {
PyObject *obj = PyList_GetItem(py_names, i);
@@ -180,7 +180,7 @@
/* Just a single element */
num_names = 1;
- names = (const char **)talloc(mem_ctx, sizeof(char *));
+ names = (const char **)_talloc(mem_ctx, sizeof(char *));
names[0] = PyString_AsString(py_names);
}
@@ -241,7 +241,7 @@
/* Convert dictionary to char ** array */
num_sids = PyList_Size(py_sids);
- sids = (DOM_SID *)talloc(mem_ctx, num_sids * sizeof(DOM_SID));
+ sids = (DOM_SID *)_talloc(mem_ctx, num_sids * sizeof(DOM_SID));
memset(sids, 0, num_sids * sizeof(DOM_SID));
@@ -259,7 +259,7 @@
/* Just a single element */
num_sids = 1;
- sids = (DOM_SID *)talloc(mem_ctx, sizeof(DOM_SID));
+ sids = (DOM_SID *)_talloc(mem_ctx, sizeof(DOM_SID));
if (!string_to_sid(&sids[0], PyString_AsString(py_sids))) {
PyErr_SetString(PyExc_ValueError, "string_to_sid failed");
Modified: branches/SAMBA_3_0/source/python/py_ntsec.c
===================================================================
--- branches/SAMBA_3_0/source/python/py_ntsec.c 2005-05-09 02:31:56 UTC (rev 6677)
+++ branches/SAMBA_3_0/source/python/py_ntsec.c 2005-05-09 12:43:12 UTC (rev 6678)
@@ -157,7 +157,7 @@
acl->num_aces = PyList_Size(obj);
- acl->ace = talloc(mem_ctx, acl->num_aces * sizeof(SEC_ACE));
+ acl->ace = _talloc(mem_ctx, acl->num_aces * sizeof(SEC_ACE));
acl->size = SEC_ACL_HEADER_SIZE;
for (i = 0; i < acl->num_aces; i++) {
Modified: branches/SAMBA_3_0/source/python/py_smb.c
===================================================================
--- branches/SAMBA_3_0/source/python/py_smb.c 2005-05-09 02:31:56 UTC (rev 6677)
+++ branches/SAMBA_3_0/source/python/py_smb.c 2005-05-09 12:43:12 UTC (rev 6678)
@@ -235,7 +235,7 @@
if (size < 1 || size > fsize - offset)
size = fsize - offset;
- if (!(data = (char *) malloc((size_t) size))) {
+ if (!(data = SMB_XMALLOC_ARRAY(char, size))) {
PyErr_SetString(PyExc_RuntimeError, "malloc failed");
return NULL;
}
Modified: branches/SAMBA_3_0/source/python/py_spoolss_drivers_conv.c
===================================================================
--- branches/SAMBA_3_0/source/python/py_spoolss_drivers_conv.c 2005-05-09 02:31:56 UTC (rev 6677)
+++ branches/SAMBA_3_0/source/python/py_spoolss_drivers_conv.c 2005-05-09 12:43:12 UTC (rev 6678)
@@ -99,7 +99,7 @@
size+=PyString_Size(borrowedRef)+1;
}
- if (!(ret = (uint16*) talloc(mem_ctx,(size+1)*sizeof(uint16))))
+ if (!(ret = (uint16*)_talloc(mem_ctx,((size+1)*sizeof(uint16)))))
goto done;
/* create null terminated sequence of null terminated strings */
Modified: branches/SAMBA_3_0/source/python/py_spoolss_printers.c
===================================================================
--- branches/SAMBA_3_0/source/python/py_spoolss_printers.c 2005-05-09 02:31:56 UTC (rev 6677)
+++ branches/SAMBA_3_0/source/python/py_spoolss_printers.c 2005-05-09 12:43:12 UTC (rev 6678)
@@ -43,7 +43,7 @@
return NULL;
}
- server = strdup(unc_name + 2);
+ server = SMB_XSTRDUP(unc_name + 2);
if (strchr(server, '\\')) {
char *c = strchr(server, '\\');
Modified: branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c
===================================================================
--- branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c 2005-05-09 02:31:56 UTC (rev 6677)
+++ branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c 2005-05-09 12:43:12 UTC (rev 6678)
@@ -291,7 +291,7 @@
|| !PyDict_Check(obj))
goto done;
- info->devmode = talloc(mem_ctx, sizeof(DEVICEMODE));
+ info->devmode = _talloc(mem_ctx, sizeof(DEVICEMODE));
if (!py_to_DEVICEMODE(info->devmode, obj))
goto done;
Modified: branches/SAMBA_3_0/source/python/py_srvsvc.c
===================================================================
--- branches/SAMBA_3_0/source/python/py_srvsvc.c 2005-05-09 02:31:56 UTC (rev 6677)
+++ branches/SAMBA_3_0/source/python/py_srvsvc.c 2005-05-09 12:43:12 UTC (rev 6678)
@@ -93,7 +93,7 @@
return NULL;
}
- server = strdup(unc_name + 2);
+ server = SMB_XSTRDUP(unc_name + 2);
if (strchr(server, '\\')) {
char *c = strchr(server, '\\');
Modified: branches/SAMBA_3_0/source/python/py_tdb.c
===================================================================
--- branches/SAMBA_3_0/source/python/py_tdb.c 2005-05-09 02:31:56 UTC (rev 6677)
+++ branches/SAMBA_3_0/source/python/py_tdb.c 2005-05-09 12:43:12 UTC (rev 6678)
@@ -348,7 +348,7 @@
/* Turn python list into array of keys */
*num_keys = PyList_Size(py_keys);
- *keys = (TDB_DATA *)malloc(sizeof(TDB_DATA) * (*num_keys));
+ *keys = (TDB_DATA *)SMB_XMALLOC_ARRAY(TDB_DATA, (*num_keys));
for (i = 0; i < *num_keys; i++) {
PyObject *key = PyList_GetItem(py_keys, i);
@@ -368,7 +368,7 @@
/* Turn python string into a single key */
- *keys = (TDB_DATA *)malloc(sizeof(TDB_DATA));
+ *keys = (TDB_DATA *)SMB_XMALLOC_P(TDB_DATA);
*num_keys = 1;
PyArg_Parse(py_keys, "s#", &(*keys)->dptr, &(*keys)->dsize);
}
Modified: branches/SAMBA_3_0/source/python/py_tdbpack.c
===================================================================
--- branches/SAMBA_3_0/source/python/py_tdbpack.c 2005-05-09 02:31:56 UTC (rev 6677)
+++ branches/SAMBA_3_0/source/python/py_tdbpack.c 2005-05-09 12:43:12 UTC (rev 6678)
@@ -441,15 +441,16 @@
}
+#if 0 /* not used */
static void pack_bytes(long len, const char *from,
unsigned char **pbuf)
{
memcpy(*pbuf, from, len);
(*pbuf) += len;
}
+#endif
-
static PyObject *
pytdbunpack(PyObject *self,
PyObject *args)
More information about the samba-cvs
mailing list