[ctypes-commit] ctypes/source callproc.c,1.113,1.114

[Thomas H. <th...@us...>]

Update of /cvsroot/ctypes/ctypes/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8207

Modified Files:
	callproc.c 
Log Message:
Renamed get_string into string_at, and get_wstring into wstring_at.


Index: callproc.c
===================================================================
RCS file: /cvsroot/ctypes/ctypes/source/callproc.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** callproc.c	27 Oct 2004 19:58:56 -0000	1.113
--- callproc.c	28 Oct 2004 17:45:50 -0000	1.114
***************
*** 1364,1374 ****
  }
  
! static char get_string_doc[] =
! "get_string(addr[, size]) -> string\n\
  \n\
  Return the string at addr.\n";
  
  static PyObject *
! get_string(PyObject *self, PyObject *args)
  {
  	PyObject *result = NULL;
--- 1364,1374 ----
  }
  
! static char string_at_doc[] =
! "string_at(addr[, size]) -> string\n\
  \n\
  Return the string at addr.\n";
  
  static PyObject *
! string_at(PyObject *self, PyObject *args)
  {
  	PyObject *result = NULL;
***************
*** 1391,1401 ****
  
  #ifdef CTYPES_UNICODE
! static char get_wstring_doc[] =
! "get_wstring(addr[, size]) -> unicode string\n\
  \n\
  Return the wide string at addr.\n";
  
  static PyObject *
! get_wstring(PyObject *self, PyObject *args)
  {
  	PyObject *result = NULL;
--- 1391,1401 ----
  
  #ifdef CTYPES_UNICODE
! static char wstring_at_doc[] =
! "wstring_at(addr[, size]) -> unicode string\n\
  \n\
  Return the wide string at addr.\n";
  
  static PyObject *
! wstring_at(PyObject *self, PyObject *args)
  {
  	PyObject *result = NULL;
***************
*** 1419,1428 ****
  
  PyMethodDef module_methods[] = {
! 	{"get_string", get_string, METH_VARARGS, get_string_doc},
  	{"memmove", c_memmove, METH_VARARGS, memmove_doc},
  	{"memset", c_memset, METH_VARARGS, memset_doc},
  	{"cast", cast, METH_VARARGS, cast_doc},
  #ifdef CTYPES_UNICODE
! 	{"get_wstring", get_wstring, METH_VARARGS, get_wstring_doc},
  	{"set_conversion_mode", set_conversion_mode, METH_VARARGS, set_conversion_mode_doc},
  #endif
--- 1419,1428 ----
  
  PyMethodDef module_methods[] = {
! 	{"string_at", string_at, METH_VARARGS, string_at_doc},
  	{"memmove", c_memmove, METH_VARARGS, memmove_doc},
  	{"memset", c_memset, METH_VARARGS, memset_doc},
  	{"cast", cast, METH_VARARGS, cast_doc},
  #ifdef CTYPES_UNICODE
! 	{"wstring_at", wstring_at, METH_VARARGS, wstring_at_doc},
  	{"set_conversion_mode", set_conversion_mode, METH_VARARGS, set_conversion_mode_doc},
  #endif