]> granicus.if.org Git - python/commitdiff
Under OS X, history_get from readline returns a const char *, but the local
authorBrett Cannon <bcannon@gmail.com>
Sun, 22 Aug 2010 20:36:25 +0000 (20:36 +0000)
committerBrett Cannon <bcannon@gmail.com>
Sun, 22 Aug 2010 20:36:25 +0000 (20:36 +0000)
variable the return value is assigned to is char *. Since the assigned-to
variable is never changed, simply make that a const char * and cast all calls
to get_history to const char * to silence the compiler warning (found with
LLVM).

Modules/readline.c

index 2a126290189bce1124976bfaec3ab9d36ebed79e..18908ef4e6e2345afcd53bf09bfa437c7765e7d4 100644 (file)
@@ -1080,7 +1080,7 @@ call_readline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
     /* we have a valid line */
     n = strlen(p);
     if (n > 0) {
-        char *line;
+        const char *line;
         int length = _py_get_history_length();
         if (length > 0)
 #ifdef __APPLE__
@@ -1089,10 +1089,10 @@ call_readline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
                  * Libedit's emulation uses 0-based indexes,
                  * the real readline uses 1-based indexes.
                  */
-                line = history_get(length - 1)->line;
+                line = (const char *)history_get(length - 1)->line;
             } else
 #endif /* __APPLE__ */
-            line = history_get(length)->line;
+            line = (const char *)history_get(length)->line;
         else
             line = "";
         if (strcmp(p, line))