traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* timemodule.c: Add hack for Solaris 2. 

* posixmodule.c: don't prototype getcwd() -- it's not portable...
* mappingobject.c: double-check validity of last_name_char in
  dict{lookup,insert,remove}.
* arraymodule.c: need memmove only for non-STDC Suns.
* Makefile: comment out HTML_LIBS and XT_USE by default
* pythonmain.c: don't prototype getopt() -- it's not standardized
* socketmodule.c: cast flags arg to {get,set}sockopt() and addrbuf arg to
  recvfrom() to (ANY*).
* pythonrun.c (initsigs): fix prototype, make it static
* intobject.c (LONG_BIT): only #define it if not already defined
* classobject.[ch]: remove all references to unused instance_convert()
* mappingobject.c (getmappingsize): Don't return NULL in int function.
This commit is contained in:
Guido van Rossum 1993-11-23 17:53:17 +00:00
parent 83eb962528
commit b376a4ad18
11 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Include/classobject.h
View File

@ -59,8 +59,6 @@ extern object *instancemethodgetfunc PROTO((object *));
extern object *instancemethodgetself PROTO((object *)); extern object *instancemethodgetself PROTO((object *));
extern object *instancemethodgetclass PROTO((object *)); extern object *instancemethodgetclass PROTO((object *));
extern object *instance_convert PROTO((object *, char *));
extern int issubclass PROTO((object *, object *)); extern int issubclass PROTO((object *, object *));
#ifdef __cplusplus #ifdef __cplusplus

2
Modules/arraymodule.c
View File

@ -37,7 +37,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
extern char *memcpy(); extern char *memcpy();
#endif #endif
#ifdef sun #if defined(sun) && !defined(__STDC__)
/* SunOS doesn't have memmove */ /* SunOS doesn't have memmove */
#define NEED_MEMMOVE #define NEED_MEMMOVE
extern char *memcpy(); extern char *memcpy();

4
Modules/posixmodule.c
View File

@ -58,7 +58,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef SYSV #ifdef SYSV
#define UTIME_STRUCT #define UTIME_STRUCT 1
#include <dirent.h> #include <dirent.h>
#define direct dirent #define direct dirent
#ifdef i386 #ifdef i386
@ -89,7 +89,7 @@ extern int mkdir PROTO((const char *, mode_t));
extern int chdir PROTO((const char *)); extern int chdir PROTO((const char *));
extern int rmdir PROTO((const char *)); extern int rmdir PROTO((const char *));
extern int chmod PROTO((const char *, mode_t)); extern int chmod PROTO((const char *, mode_t));
extern char *getcwd PROTO((char *, int)); /* XXX or size_t? */ extern char *getcwd(); /* No PROTO((char *, int)) -- non portable */
#ifndef MSDOS #ifndef MSDOS
extern char *strerror PROTO((int)); extern char *strerror PROTO((int));
extern int link PROTO((const char *, const char *)); extern int link PROTO((const char *, const char *));

13
Modules/socketmodule.c
View File

@ -388,7 +388,7 @@ sock_allowbroadcast(s, args)
if (!getargs(args, "i", &flag)) if (!getargs(args, "i", &flag))
return NULL; return NULL;
res = setsockopt(s->sock_fd, SOL_SOCKET, SO_BROADCAST, res = setsockopt(s->sock_fd, SOL_SOCKET, SO_BROADCAST,
&flag, sizeof flag); (ANY *)&flag, sizeof flag);
if (res < 0) if (res < 0)
return socket_error(); return socket_error();
INCREF(None); INCREF(None);
@ -422,7 +422,7 @@ sock_setsockopt(s, args)
if (!getargs(args, "(iis#)", &level, &optname, &buf, &buflen)) if (!getargs(args, "(iis#)", &level, &optname, &buf, &buflen))
return NULL; return NULL;
} }
res = setsockopt(s->sock_fd, level, optname, buf, buflen); res = setsockopt(s->sock_fd, level, optname, (ANY *)buf, buflen);
if (res < 0) if (res < 0)
return socket_error(); return socket_error();
INCREF(None); INCREF(None);
@ -450,7 +450,8 @@ sock_getsockopt(s, args)
if (getargs(args, "(ii)", &level, &optname)) { if (getargs(args, "(ii)", &level, &optname)) {
int flag = 0; int flag = 0;
int flagsize = sizeof flag; int flagsize = sizeof flag;
res = getsockopt(s->sock_fd, level, optname, &flag, &flagsize); res = getsockopt(s->sock_fd, level, optname,
(ANY *)&flag, &flagsize);
if (res < 0) if (res < 0)
return socket_error(); return socket_error();
return newintobject(flag); return newintobject(flag);
@ -465,8 +466,8 @@ sock_getsockopt(s, args)
buf = newsizedstringobject((char *)NULL, buflen); buf = newsizedstringobject((char *)NULL, buflen);
if (buf == NULL) if (buf == NULL)
return NULL; return NULL;
res = getsockopt(s->sock_fd, level, optname, getstringvalue(buf), res = getsockopt(s->sock_fd, level, optname,
&buflen); (ANY *)getstringvalue(buf), &buflen);
if (res < 0) { if (res < 0) {
DECREF(buf); DECREF(buf);
return socket_error(); return socket_error();
@ -720,7 +721,7 @@ sock_recvfrom(s, args)
return NULL; return NULL;
BGN_SAVE BGN_SAVE
n = recvfrom(s->sock_fd, getstringvalue(buf), len, flags, n = recvfrom(s->sock_fd, getstringvalue(buf), len, flags,
addrbuf, &addrlen); (ANY *)addrbuf, &addrlen);
END_SAVE END_SAVE
if (n < 0) if (n < 0)
return socket_error(); return socket_error();

7
Modules/timemodule.c
View File

@ -72,6 +72,13 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif /* !unix */ #endif /* !unix */
#ifdef SYSV #ifdef SYSV
#if defined(sun) && defined(__STDC__)
/* Temporary hack for Solaris 2. */
#define _timezone timezone
#define _altzone altzone
#define _daylight daylight
#define _tzname tzname
#endif
/* Access timezone stuff */ /* Access timezone stuff */
#ifdef OLDTZ /* ANSI prepends underscore to these */ #ifdef OLDTZ /* ANSI prepends underscore to these */
#define _timezone timezone /* seconds to be added to GMT */ #define _timezone timezone /* seconds to be added to GMT */

8
Objects/classobject.c
View File

@ -960,14 +960,6 @@ typeobject Instancetype = {
instance_hash, /*tp_hash*/ instance_hash, /*tp_hash*/
}; };
static object *
instance_convert(inst, methodname)
object *inst;
char *methodname;
{
return generic_unary_op((instanceobject *)inst, methodname);
}
/* Instance method objects are used for two purposes: /* Instance method objects are used for two purposes:
(a) as bound instance methods (returned by instancename.methodname) (a) as bound instance methods (returned by instancename.methodname)

9
Objects/dictobject.c
View File

@ -572,7 +572,7 @@ getmappingsize(mp)
{ {
if (mp == NULL || !is_mappingobject(mp)) { if (mp == NULL || !is_mappingobject(mp)) {
err_badcall(); err_badcall();
return NULL; return 0;
} }
return ((mappingobject *)mp)->ma_used; return ((mappingobject *)mp)->ma_used;
} }
@ -773,7 +773,7 @@ dictlookup(v, key)
object *v; object *v;
char *key; char *key;
{ {
if (key != last_name_char) { if (key != last_name_char || strcmp(key, getstringvalue(last_name_object)) != 0) {
XDECREF(last_name_object); XDECREF(last_name_object);
last_name_object = newstringobject(key); last_name_object = newstringobject(key);
if (last_name_object == NULL) { if (last_name_object == NULL) {
@ -791,7 +791,7 @@ dictinsert(v, key, item)
char *key; char *key;
object *item; object *item;
{ {
if (key != last_name_char) { if (key != last_name_char || strcmp(key, getstringvalue(last_name_object)) != 0) {
XDECREF(last_name_object); XDECREF(last_name_object);
last_name_object = newstringobject(key); last_name_object = newstringobject(key);
if (last_name_object == NULL) { if (last_name_object == NULL) {
@ -808,7 +808,8 @@ dictremove(v, key)
object *v; object *v;
char *key; char *key;
{ {
if (key != last_name_char) { if (key != last_name_char ||
strcmp(key, getstringvalue(last_name_object)) != 0) {
XDECREF(last_name_object); XDECREF(last_name_object);
last_name_object = newstringobject(key); last_name_object = newstringobject(key);
if (last_name_object == NULL) { if (last_name_object == NULL) {

2
Objects/intobject.c
View File

@ -43,7 +43,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define CHAR_BIT 8 #define CHAR_BIT 8
#endif #endif
#ifndef LONG_BIT
#define LONG_BIT (CHAR_BIT * sizeof(long)) #define LONG_BIT (CHAR_BIT * sizeof(long))
#endif
/* Standard Booleans */ /* Standard Booleans */

9
Objects/mappingobject.c
View File

@ -572,7 +572,7 @@ getmappingsize(mp)
{ {
if (mp == NULL || !is_mappingobject(mp)) { if (mp == NULL || !is_mappingobject(mp)) {
err_badcall(); err_badcall();
return NULL; return 0;
} }
return ((mappingobject *)mp)->ma_used; return ((mappingobject *)mp)->ma_used;
} }
@ -773,7 +773,7 @@ dictlookup(v, key)
object *v; object *v;
char *key; char *key;
{ {
if (key != last_name_char) { if (key != last_name_char || strcmp(key, getstringvalue(last_name_object)) != 0) {
XDECREF(last_name_object); XDECREF(last_name_object);
last_name_object = newstringobject(key); last_name_object = newstringobject(key);
if (last_name_object == NULL) { if (last_name_object == NULL) {
@ -791,7 +791,7 @@ dictinsert(v, key, item)
char *key; char *key;
object *item; object *item;
{ {
if (key != last_name_char) { if (key != last_name_char || strcmp(key, getstringvalue(last_name_object)) != 0) {
XDECREF(last_name_object); XDECREF(last_name_object);
last_name_object = newstringobject(key); last_name_object = newstringobject(key);
if (last_name_object == NULL) { if (last_name_object == NULL) {
@ -808,7 +808,8 @@ dictremove(v, key)
object *v; object *v;
char *key; char *key;
{ {
if (key != last_name_char) { if (key != last_name_char ||
strcmp(key, getstringvalue(last_name_object)) != 0) {
XDECREF(last_name_object); XDECREF(last_name_object);
last_name_object = newstringobject(key); last_name_object = newstringobject(key);
if (last_name_object == NULL) { if (last_name_object == NULL) {

2
Python/pythonmain.c
View File

@ -33,7 +33,7 @@ extern int killprint; /* Defined in ceval.c */
/* Interface to getopt(): */ /* Interface to getopt(): */
extern int optind; extern int optind;
extern char *optarg; extern char *optarg;
extern int getopt PROTO((int, char **, char *)); extern int getopt(); /* PROTO((int, char **, char *)); -- not standardized */
extern char *getenv(); extern char *getenv();

2
Python/pythonrun.c
View File

@ -58,7 +58,7 @@ static object *run_node PROTO((node *n, char *filename,
object *globals, object *locals)); object *globals, object *locals));
static object *eval_node PROTO((node *n, char *filename, static object *eval_node PROTO((node *n, char *filename,
object *globals, object *locals)); object *globals, object *locals));
void initsigs PROTO(()); static void initsigs PROTO((void));
int debugging; /* Needed by parser.c */ int debugging; /* Needed by parser.c */
int verbose; /* Needed by import.c */ int verbose; /* Needed by import.c */