[Python-checkins] CVS: python/dist/src/Modules nismodule.c,2.17,2.18 pcremodule.c,2.21,2.22 pwdmodule.c,1.19,1.20
Peter Schneider-Kamp
python-dev@python.org
2000年7月10日 06:12:30 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30258
Modified Files:
nismodule.c pcremodule.c pwdmodule.c
Log Message:
ANSI-fication
Index: nismodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/nismodule.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** nismodule.c 2000年07月09日 03:09:55 2.17
--- nismodule.c 2000年07月10日 13:12:27 2.18
***************
*** 27,32 ****
static PyObject *
! nis_error (err)
! int err;
{
PyErr_SetString(NisError, yperr_string(err));
--- 27,31 ----
static PyObject *
! nis_error (int err)
{
PyErr_SetString(NisError, yperr_string(err));
***************
*** 51,57 ****
static char *
! nis_mapname (map, pfix)
! char *map;
! int *pfix;
{
int i;
--- 50,54 ----
static char *
! nis_mapname (char *map, int *pfix)
{
int i;
***************
*** 80,90 ****
static int
! nis_foreach (instatus, inkey, inkeylen, inval, invallen, indata)
! int instatus;
! char *inkey;
! int inkeylen;
! char *inval;
! int invallen;
! struct ypcallback_data *indata;
{
if (instatus == YP_TRUE) {
--- 77,82 ----
static int
! nis_foreach (int instatus, char *inkey, int inkeylen, char *inval,
! int invallen, struct ypcallback_data *indata)
{
if (instatus == YP_TRUE) {
***************
*** 119,125 ****
static PyObject *
! nis_match (self, args)
! PyObject *self;
! PyObject *args;
{
char *match;
--- 111,115 ----
static PyObject *
! nis_match (PyObject *self, PyObject *args)
{
char *match;
***************
*** 151,157 ****
static PyObject *
! nis_cat (self, args)
! PyObject *self;
! PyObject *args;
{
char *domain;
--- 141,145 ----
static PyObject *
! nis_cat (PyObject *self, PyObject *args)
{
char *domain;
***************
*** 229,235 ****
static
bool_t
! nis_xdr_domainname(xdrs, objp)
! XDR *xdrs;
! domainname *objp;
{
if (!xdr_string(xdrs, objp, YPMAXDOMAIN)) {
--- 217,221 ----
static
bool_t
! nis_xdr_domainname(XDR *xdrs, domainname *objp)
{
if (!xdr_string(xdrs, objp, YPMAXDOMAIN)) {
***************
*** 241,247 ****
static
bool_t
! nis_xdr_mapname(xdrs, objp)
! XDR *xdrs;
! mapname *objp;
{
if (!xdr_string(xdrs, objp, YPMAXMAP)) {
--- 227,231 ----
static
bool_t
! nis_xdr_mapname(XDR *xdrs, mapname *objp)
{
if (!xdr_string(xdrs, objp, YPMAXMAP)) {
***************
*** 253,259 ****
static
bool_t
! nis_xdr_ypmaplist(xdrs, objp)
! XDR *xdrs;
! nismaplist *objp;
{
if (!nis_xdr_mapname(xdrs, &objp->map)) {
--- 237,241 ----
static
bool_t
! nis_xdr_ypmaplist(XDR *xdrs, nismaplist *objp)
{
if (!nis_xdr_mapname(xdrs, &objp->map)) {
***************
*** 270,276 ****
static
bool_t
! nis_xdr_ypstat(xdrs, objp)
! XDR *xdrs;
! nisstat *objp;
{
if (!xdr_enum(xdrs, (enum_t *)objp)) {
--- 252,256 ----
static
bool_t
! nis_xdr_ypstat(XDR *xdrs, nisstat *objp)
{
if (!xdr_enum(xdrs, (enum_t *)objp)) {
***************
*** 283,289 ****
static
bool_t
! nis_xdr_ypresp_maplist(xdrs, objp)
! XDR *xdrs;
! nisresp_maplist *objp;
{
if (!nis_xdr_ypstat(xdrs, &objp->stat)) {
--- 263,267 ----
static
bool_t
! nis_xdr_ypresp_maplist(XDR *xdrs, nisresp_maplist *objp)
{
if (!nis_xdr_ypstat(xdrs, &objp->stat)) {
***************
*** 301,307 ****
static
nisresp_maplist *
! nisproc_maplist_2(argp, clnt)
! domainname *argp;
! CLIENT *clnt;
{
static nisresp_maplist res;
--- 279,283 ----
static
nisresp_maplist *
! nisproc_maplist_2(domainname *argp, CLIENT *clnt)
{
static nisresp_maplist res;
***************
*** 363,369 ****
static PyObject *
! nis_maps (self, args)
! PyObject *self;
! PyObject *args;
{
nismaplist *maps;
--- 339,343 ----
static PyObject *
! nis_maps (PyObject *self, PyObject *args)
{
nismaplist *maps;
Index: pcremodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pcremodule.c,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** pcremodule.c 2000年07月06日 19:38:49 2.21
--- pcremodule.c 2000年07月10日 13:12:27 2.22
***************
*** 61,66 ****
static PcreObject *
! newPcreObject(arg)
! PyObject *arg;
{
PcreObject *self;
--- 61,65 ----
static PcreObject *
! newPcreObject(PyObject *args)
{
PcreObject *self;
***************
*** 76,81 ****
static void
! PyPcre_dealloc(self)
! PcreObject *self;
{
if (self->regex) (pcre_free)(self->regex);
--- 75,79 ----
static void
! PyPcre_dealloc(PcreObject *self)
{
if (self->regex) (pcre_free)(self->regex);
***************
*** 86,92 ****
static PyObject *
! PyPcre_exec(self, args)
! PcreObject *self;
! PyObject *args;
{
char *string;
--- 84,88 ----
static PyObject *
! PyPcre_exec(PcreObject *self, PyObject *args)
{
char *string;
***************
*** 140,146 ****
static PyObject *
! PyPcre_getattr(self, name)
! PcreObject *self;
! char *name;
{
return Py_FindMethod(Pcre_methods, (PyObject *)self, name);
--- 136,140 ----
static PyObject *
! PyPcre_getattr(PcreObject *self, char *name)
{
return Py_FindMethod(Pcre_methods, (PyObject *)self, name);
***************
*** 169,175 ****
static PyObject *
! PyPcre_compile(self, args)
! PyObject *self; /* Not used */
! PyObject *args;
{
PcreObject *rv;
--- 163,167 ----
static PyObject *
! PyPcre_compile(PyObject *self, PyObject *args)
{
PcreObject *rv;
***************
*** 221,227 ****
static PyObject *
! PyPcre_expand_escape(pattern, pattern_len, indexptr, typeptr)
! unsigned char *pattern;
! int pattern_len, *indexptr, *typeptr;
{
unsigned char c;
--- 213,218 ----
static PyObject *
! PyPcre_expand_escape(unsigned char *pattern, int pattern_len,
! int *indexptr, int *typeptr)
{
unsigned char c;
***************
*** 448,454 ****
static PyObject *
! PyPcre_expand(self, args)
! PyObject *self;
! PyObject *args;
{
PyObject *results, *match_obj;
--- 439,443 ----
static PyObject *
! PyPcre_expand(PyObject *self, PyObject *args)
{
PyObject *results, *match_obj;
***************
*** 624,631 ****
static void
! insint(d, name, value)
! PyObject * d;
! char * name;
! int value;
{
PyObject *v = PyInt_FromLong((long) value);
--- 613,617 ----
static void
! insint(PyObject *d, char *name, int value)
{
PyObject *v = PyInt_FromLong((long) value);
Index: pwdmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pwdmodule.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** pwdmodule.c 2000年06月30日 23:58:05 1.19
--- pwdmodule.c 2000年07月10日 13:12:27 1.20
***************
*** 28,33 ****
static PyObject *
! mkpwent(p)
! struct passwd *p;
{
#ifdef __BEOS__
--- 28,32 ----
static PyObject *
! mkpwent(struct passwd *p)
{
#ifdef __BEOS__
***************
*** 67,73 ****
static PyObject *
! pwd_getpwuid(self, args)
! PyObject *self;
! PyObject *args;
{
int uid;
--- 66,70 ----
static PyObject *
! pwd_getpwuid(PyObject *self, PyObject *args)
{
int uid;
***************
*** 88,94 ****
static PyObject *
! pwd_getpwnam(self, args)
! PyObject *self;
! PyObject *args;
{
char *name;
--- 85,89 ----
static PyObject *
! pwd_getpwnam(PyObject *self, PyObject *args)
{
char *name;
***************
*** 111,117 ****
static PyObject *
! pwd_getpwall(self, args)
! PyObject *self;
! PyObject *args;
{
PyObject *d;
--- 106,110 ----
static PyObject *
! pwd_getpwall(PyObject *self, PyObject *args)
{
PyObject *d;