Skip to content

Commit 80bb965

Browse files
committed
Keep gcc -Wall happy.
1 parent ed0af8f commit 80bb965

6 files changed

Lines changed: 38 additions & 28 deletions

File tree

‎Python/compile.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,6 @@ com_sliceobj(c, n)
994994
{
995995
int i=0;
996996
int ns=2; /* number of slice arguments */
997-
int first_missing=0;
998997
node *ch;
999998

1000999
/* first argument */
@@ -2871,7 +2870,7 @@ optimize(c)
28712870
{
28722871
unsigned char *next_instr, *cur_instr;
28732872
int opcode;
2874-
int oparg;
2873+
int oparg = 0;
28752874
object *name;
28762875
object *error_type, *error_value, *error_traceback;
28772876

‎Python/getargs.c‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -685,12 +685,11 @@ vgetargskeywords(args, keywords, format, kwlist, p_va)
685685
char *message = NULL;
686686
int min = -1;
687687
int max = 0;
688-
int level = 0;
689688
char *formatsave = format;
690689
int i, len, tplen, kwlen;
691690
char *msg, *ks, **p;
692691
int nkwds, pos, match, converted;
693-
object *key, *value, *item;
692+
object *key, *value;
694693

695694
/* nested tuples cannot be parsed when using keyword arguments */
696695

@@ -831,9 +830,11 @@ vgetargskeywords(args, keywords, format, kwlist, p_va)
831830

832831
converted = 0;
833832
for (i = tplen; i < nkwds; i++) {
833+
object *item;
834834
if (*format == '|')
835835
format++;
836-
if (item = PyMapping_GetItemString(keywords, kwlist[i])) {
836+
item = PyMapping_GetItemString(keywords, kwlist[i]);
837+
if (item != NULL) {
837838
msg = convertitem(item, &format, p_va, levels, msgbuf);
838839
if (msg) {
839840
seterror(i+1, msg, levels, fname, message);
@@ -890,108 +891,106 @@ skipitem(p_format, p_va)
890891

891892
case 'b': /* byte -- very short int */
892893
{
893-
va_arg(*p_va, char *);
894+
(void) va_arg(*p_va, char *);
894895
break;
895896
}
896897

897898
case 'h': /* short int */
898899
{
899-
va_arg(*p_va, short *);
900+
(void) va_arg(*p_va, short *);
900901
break;
901902
}
902903

903904
case 'i': /* int */
904905
{
905-
va_arg(*p_va, int *);
906+
(void) va_arg(*p_va, int *);
906907
break;
907908
}
908909

909910
case 'l': /* long int */
910911
{
911-
va_arg(*p_va, long *);
912+
(void) va_arg(*p_va, long *);
912913
break;
913914
}
914915

915916
case 'f': /* float */
916917
{
917-
va_arg(*p_va, float *);
918+
(void) va_arg(*p_va, float *);
918919
break;
919920
}
920921

921922
case 'd': /* double */
922923
{
923-
va_arg(*p_va, double *);
924+
(void) va_arg(*p_va, double *);
924925
break;
925926
}
926927

927928
#ifndef WITHOUT_COMPLEX
928929
case 'D': /* complex double */
929930
{
930-
va_arg(*p_va, Py_complex *);
931+
(void) va_arg(*p_va, Py_complex *);
931932
break;
932933
}
933934
#endif /* WITHOUT_COMPLEX */
934935

935936
case 'c': /* char */
936937
{
937-
va_arg(*p_va, char *);
938+
(void) va_arg(*p_va, char *);
938939
break;
939940
}
940941

941942
case 's': /* string */
942943
{
943-
va_arg(*p_va, char **);
944+
(void) va_arg(*p_va, char **);
944945
if (*format == '#') {
945-
va_arg(*p_va, int *);
946+
(void) va_arg(*p_va, int *);
946947
format++;
947948
}
948949
break;
949950
}
950951

951952
case 'z': /* string */
952953
{
953-
va_arg(*p_va, char **);
954+
(void) va_arg(*p_va, char **);
954955
if (*format == '#') {
955-
va_arg(*p_va, int *);
956+
(void) va_arg(*p_va, int *);
956957
format++;
957958
}
958959
break;
959960
}
960961

961962
case 'S': /* string object */
962963
{
963-
va_arg(*p_va, object **);
964+
(void) va_arg(*p_va, object **);
964965
break;
965966
}
966967

967968
case 'O': /* object */
968969
{
969-
typeobject *type;
970-
object **p;
971970
if (*format == '!') {
972971
format++;
973-
va_arg(*p_va, typeobject*);
974-
va_arg(*p_va, object **);
972+
(void) va_arg(*p_va, typeobject*);
973+
(void) va_arg(*p_va, object **);
975974
}
976975
#if 0
977976
/* I don't know what this is for */
978977
else if (*format == '?') {
979978
inquiry pred = va_arg(*p_va, inquiry);
980979
format++;
981980
if ((*pred)(arg)) {
982-
va_arg(*p_va, object **);
981+
(void) va_arg(*p_va, object **);
983982
}
984983
}
985984
#endif
986985
else if (*format == '&') {
987986
typedef int (*converter)
988987
PROTO((object *, void *));
989-
va_arg(*p_va, converter);
990-
va_arg(*p_va, void *);
988+
(void) va_arg(*p_va, converter);
989+
(void) va_arg(*p_va, void *);
991990
format++;
992991
}
993992
else {
994-
va_arg(*p_va, object **);
993+
(void) va_arg(*p_va, object **);
995994
}
996995
break;
997996
}

‎Python/import.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ PERFORMANCE OF THIS SOFTWARE.
5353
#include "macglue.h"
5454
#endif
5555

56+
#ifdef HAVE_UNISTD_H
57+
#include <unistd.h>
58+
#endif
59+
5660
extern long getmtime(); /* In getmtime.c */
5761

5862
/* Magic word to reject .pyc files generated by other Python versions */
@@ -419,7 +423,7 @@ find_module(name, path, buf, buflen, p_fp)
419423
FILE **p_fp;
420424
{
421425
int i, npath, len, namelen;
422-
struct filedescr *fdp;
426+
struct filedescr *fdp = NULL;
423427
FILE *fp = NULL;
424428

425429
#ifdef MS_COREDLL

‎Python/mystrtoul.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ int base;
112112
}
113113

114114
/* do the conversion */
115-
while (c = Py_CHARMASK(*str))
115+
while ((c = Py_CHARMASK(*str)) != '\0')
116116
{
117117
if (isdigit(c) && c - '0' < base)
118118
c -= '0';

‎Python/pythonrun.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ PERFORMANCE OF THIS SOFTWARE.
4747
#include "import.h"
4848
#include "marshal.h"
4949

50+
#ifdef HAVE_UNISTD_H
51+
#include <unistd.h>
52+
#endif
53+
5054
#ifdef HAVE_SIGNAL_H
5155
#include <signal.h>
5256
#endif

‎Python/thread.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ PERFORMANCE OF THIS SOFTWARE.
4545
extern char *getenv();
4646
#endif
4747

48+
#ifdef HAVE_UNISTD_H
49+
#include <unistd.h>
50+
#endif
51+
4852
#include "thread.h"
4953

5054
#ifdef __ksr__

0 commit comments

Comments
 (0)