diff options
| author | Fredrik Lundh <fredrik@pythonware.com> | 2000-07-10 15:59:30 +0000 | 
|---|---|---|
| committer | Fredrik Lundh <fredrik@pythonware.com> | 2000-07-10 15:59:30 +0000 | 
| commit | 44328e60df37993f7342742e25b89a09979e9ed9 (patch) | |
| tree | 00ce68b02dc0486a3242bbccbd46ab4f5b3d11c3 | |
| parent | 1bbddd085c54b5f8d57af3f96d2e33c33e34e23e (diff) | |
| download | cpython-git-44328e60df37993f7342742e25b89a09979e9ed9.tar.gz | |
-- get rid of a compiler warning on unix.  (as reported
   for #100836, but implemented in a different way)
| -rw-r--r-- | Modules/posixmodule.c | 34 | 
1 files changed, 13 insertions, 21 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 2cfd39d52e..cf12b87977 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -512,25 +512,6 @@ posix_strint(PyObject *args, char *format, int (*func)(const char *, int))  	return Py_None;  } -static PyObject * -posix_strintint(PyObject *args, char *format, -		int (*func)(const char *, int, int)) -{ -	char *path; -	int i,i2; -	int res; -	if (!PyArg_ParseTuple(args, format, &path, &i, &i2)) -		return NULL; -	Py_BEGIN_ALLOW_THREADS -	res = (*func)(path, i, i2); -	Py_END_ALLOW_THREADS -	if (res < 0) -		return posix_error_with_filename(path); -	Py_INCREF(Py_None); -	return Py_None; -} - -  /* pack a system stat C structure into the Python stat tuple      (used by posix_stat() and posix_fstat()) */ @@ -768,7 +749,7 @@ posix_fdatasync(PyObject *self, PyObject *args)  #endif /* HAVE_FDATASYNC */ -#ifdef HAVE_CHOWN +#if HAVE_CHOWN  static char posix_chown__doc__[] =  "chown(path, uid, gid) -> None\n\  Change the owner and group id of path to the numeric uid and gid."; @@ -776,7 +757,18 @@ Change the owner and group id of path to the numeric uid and gid.";  static PyObject *  posix_chown(PyObject *self, PyObject *args)  { -	return posix_strintint(args, "sii:chown", chown); +	char *path; +	int uid, gid; +	int res; +	if (!PyArg_ParseTuple(args, "sii:chown", &path, &uid, &gid)) +		return NULL; +	Py_BEGIN_ALLOW_THREADS +	res = chown(path, (uid_t) uid, (gid_t) gid); +	Py_END_ALLOW_THREADS +	if (res < 0) +		return posix_error_with_filename(path); +	Py_INCREF(Py_None); +	return Py_None;  }  #endif /* HAVE_CHOWN */  | 
