bpo-32711: Fix warnings for Python/ast_unparse.c (#5426)

matrixise · tiran · commit 83ab995871ff · 2018-02-01T17:59:27.000+01:00
* bpo-32711: Fix warnings for Python/ast_unparse.c
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-01-29-14-36-37.bpo-32711.8hQFJP.rst b/Misc/NEWS.d/next/Core and Builtins/2018-01-29-14-36-37.bpo-32711.8hQFJP.rst
@@ -0,0 +1 @@
+Fix the warning messages for Python/ast_unparse.c. Patch by Stéphane Wirtel
diff --git a/Python/ast_unparse.c b/Python/ast_unparse.c
@@ -20,7 +20,7 @@ append_formattedvalue(_PyUnicodeWriter *writer, expr_ty e, bool is_format_spec);
 static int
 append_charp(_PyUnicodeWriter *writer, const char *charp)
 {
-        return _PyUnicodeWriter_WriteASCIIString(writer, charp, -1);
+    return _PyUnicodeWriter_WriteASCIIString(writer, charp, -1);
 }
 
 static int
@@ -100,6 +100,8 @@ append_ast_binop(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)
     case BitAnd: op = " & "; break;
     case FloorDiv: op = " // "; break;
     case Pow: op = " ** "; break;
+    default:
+        Py_UNREACHABLE();
     }
 
     if (-1 == append_charp(writer, op)) {
@@ -127,6 +129,8 @@ append_ast_unaryop(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)
     case Not: op = "not "; break;
     case UAdd: op = "+"; break;
     case USub: op = "-"; break;
+    default:
+        Py_UNREACHABLE();
     }
 
     if (-1 == append_charp(writer, op)) {
@@ -856,7 +860,7 @@ append_formattedvalue(_PyUnicodeWriter *writer, expr_ty e, bool is_format_spec)
             return -1;
         }
     }
-    if (e->v.FormattedValue.format_spec > 0) {
+    if (e->v.FormattedValue.format_spec) {
         if (-1 == _PyUnicodeWriter_WriteASCIIString(writer, ":", 1) ||
             -1 == append_fstring_element(writer,
                                          e->v.FormattedValue.format_spec,
@@ -1119,7 +1123,7 @@ append_ast_expr(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)
 }
 
 static int
-maybe_init_static_strings()
+maybe_init_static_strings(void)
 {
     if (!_str_open_br &&
         !(_str_open_br = PyUnicode_InternFromString("{"))) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix the warning messages for Python/ast_unparse.c. Patch by Stéphane Wirtel`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ append_formattedvalue(_PyUnicodeWriter *writer, expr_ty e, bool is_format_spec);`
`20`	`20`	`static int`
`21`	`21`	`append_charp(_PyUnicodeWriter writer, const char charp)`
`22`	`22`	`{`
`23`		`- return _PyUnicodeWriter_WriteASCIIString(writer, charp, -1);`
	`23`	`+ return _PyUnicodeWriter_WriteASCIIString(writer, charp, -1);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`static int`
`@@ -100,6 +100,8 @@ append_ast_binop(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)`
`100`	`100`	`case BitAnd: op = " & "; break;`
`101`	`101`	`case FloorDiv: op = " // "; break;`
`102`	`102`	`case Pow: op = " ** "; break;`
	`103`	`+ default:`
	`104`	`+ Py_UNREACHABLE();`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`if (-1 == append_charp(writer, op)) {`
`@@ -127,6 +129,8 @@ append_ast_unaryop(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)`
`127`	`129`	`case Not: op = "not "; break;`
`128`	`130`	`case UAdd: op = "+"; break;`
`129`	`131`	`case USub: op = "-"; break;`
	`132`	`+ default:`
	`133`	`+ Py_UNREACHABLE();`
`130`	`134`	`}`
`131`	`135`
`132`	`136`	`if (-1 == append_charp(writer, op)) {`
`@@ -856,7 +860,7 @@ append_formattedvalue(_PyUnicodeWriter *writer, expr_ty e, bool is_format_spec)`
`856`	`860`	`return -1;`
`857`	`861`	`}`
`858`	`862`	`}`
`859`		`- if (e->v.FormattedValue.format_spec > 0) {`
	`863`	`+ if (e->v.FormattedValue.format_spec) {`
`860`	`864`	`if (-1 == _PyUnicodeWriter_WriteASCIIString(writer, ":", 1) \|\|`
`861`	`865`	`-1 == append_fstring_element(writer,`
`862`	`866`	`e->v.FormattedValue.format_spec,`
`@@ -1119,7 +1123,7 @@ append_ast_expr(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)`
`1119`	`1123`	`}`
`1120`	`1124`
`1121`	`1125`	`static int`
`1122`		`-maybe_init_static_strings()`
	`1126`	`+maybe_init_static_strings(void)`
`1123`	`1127`	`{`
`1124`	`1128`	`if (!_str_open_br &&`
`1125`	`1129`	`!(_str_open_br = PyUnicode_InternFromString("{"))) {`