*.c: Separate string function calls according to text/binary usage.

[catacomb-python] / rand.c

diff --git a/rand.c b/rand.c
index 069c351..675bf70 100644 (file)
--- a/rand.c
+++ b/rand.c
@@ -146,7 +146,7 @@ static PyObject *grmeth_block(PyObject *me, PyObject *arg)
   if (!PyArg_ParseTuple(arg, "O&:block", convulong, &n)) goto end;
   if (grand_check(me)) return (0);
   rc = bytestring_pywrap(0, n);
-  grand_fill(GRAND_R(me), PyString_AS_STRING(rc), n);
+  grand_fill(GRAND_R(me), BIN_PTR(rc), n);
 end:
   return (rc);
 }
@@ -239,7 +239,7 @@ static PyObject *grmeth_mask(PyObject *me, PyObject *arg)
   if (!PyArg_ParseTuple(arg, "O&:mask", convbin, &in)) return (0);
   if (grand_check(me)) return (0);
   rc = bytestring_pywrap(0, in.sz);
-  q = (octet *)PyString_AS_STRING(rc);
+  q = (octet *)BIN_PTR(rc);
   GR_FILL(r, q, in.sz);
   p = in.p; n = in.sz; while (n--) *q++ ^= *p++;
   return (rc);
@@ -253,7 +253,7 @@ static void grand_pydealloc(PyObject *me)
 }
 
 static PyObject *grget_name(PyObject *me, void *hunoz)
-  { return (grand_check(me) ? 0 : PyString_FromString(GRAND_R(me)->ops->name)); }
+  { return (grand_check(me) ? 0 : TEXT_FROMSTR(GRAND_R(me)->ops->name)); }
 
 static PyObject *grget_cryptop(PyObject *me, void *hunoz)
   { return (grand_check(me) ? 0 : getbool(GRAND_R(me)->ops->f & GRAND_CRYPTO)); }
@@ -731,7 +731,7 @@ static PyObject *gccrand_pywrap(const gccrand_info *info)
 }
 
 static PyObject *gccrget_name(PyObject *me, void *hunoz)
-  { return (PyString_FromString(GCCRAND_INFO(me)->name)); }
+  { return (TEXT_FROMSTR(GCCRAND_INFO(me)->name)); }
 static PyObject *gccrget_keysz(PyObject *me, void *hunoz)
   { return (keysz_pywrap(GCCRAND_INFO(me)->keysz)); }
 
@@ -1135,7 +1135,7 @@ static PyObject *drget_seed(PyObject *me, void *hunoz)
   grand *r = GRAND_R(me);
   int n = r->ops->misc(r, DSARAND_SEEDSZ);
   PyObject *rc = bytestring_pywrap(0, n);
-  r->ops->misc(r, DSARAND_GETSEED, PyString_AS_STRING(rc));
+  r->ops->misc(r, DSARAND_GETSEED, BIN_PTR(rc));
   return (rc);
 }