mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

#2560: remove an unnecessary 'for' loop from my_fgets() in Parser/myreadline.c.

Browse source 
Noted by Joseph Armbruster; patch by Jessica McKellar.

The original code was 'for (;;) {...}', where ... ended
with a 'return -2' statement and did not contain a 'break' or 'continue'
statement.  Therefore, the body of the loop is always executed once.

Once upon a time there was a 'continue' in the loop, but it was removed in
rev36346, committed by mwh on Wed Jul 7 17:44:12 2004.
This commit is contained in:
Andrew M. Kuchling 2010-02-22 22:48:41 +00:00
parent 5cac46dd41
commit b64d61369a
2 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -12,6 +12,9 @@ What's New in Python 2.7 alpha 4?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #2560: remove an unnecessary 'for' loop from my_fgets() in
Parser/myreadline.c.
- Issue #7988: Fix default alignment to be right aligned for - Issue #7988: Fix default alignment to be right aligned for
complex.__format__. Now it matches other numeric types. complex.__format__. Now it matches other numeric types.

105
Parser/myreadline.c
View file

@ -40,66 +40,63 @@ static int
my_fgets(char *buf, int len, FILE *fp) my_fgets(char *buf, int len, FILE *fp)
{ {
char *p; char *p;
for (;;) { if (PyOS_InputHook != NULL)
if (PyOS_InputHook != NULL) (void)(PyOS_InputHook)();
(void)(PyOS_InputHook)(); errno = 0;
errno = 0; p = fgets(buf, len, fp);
p = fgets(buf, len, fp); if (p != NULL)
if (p != NULL) return 0; /* No error */
return 0; /* No error */
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
/* In the case of a Ctrl+C or some other external event /* In the case of a Ctrl+C or some other external event
interrupting the operation: interrupting the operation:
Win2k/NT: ERROR_OPERATION_ABORTED is the most recent Win32 Win2k/NT: ERROR_OPERATION_ABORTED is the most recent Win32
error code (and feof() returns TRUE). error code (and feof() returns TRUE).
Win9x: Ctrl+C seems to have no effect on fgets() returning Win9x: Ctrl+C seems to have no effect on fgets() returning
early - the signal handler is called, but the fgets() early - the signal handler is called, but the fgets()
only returns "normally" (ie, when Enter hit or feof()) only returns "normally" (ie, when Enter hit or feof())
*/
if (GetLastError()==ERROR_OPERATION_ABORTED) {
/* Signals come asynchronously, so we sleep a brief
moment before checking if the handler has been
triggered (we cant just return 1 before the
signal handler has been called, as the later
signal may be treated as a separate interrupt).
*/ */
if (GetLastError()==ERROR_OPERATION_ABORTED) { Sleep(1);
/* Signals come asynchronously, so we sleep a brief
moment before checking if the handler has been
triggered (we cant just return 1 before the
signal handler has been called, as the later
signal may be treated as a separate interrupt).
*/
Sleep(1);
if (PyOS_InterruptOccurred()) {
return 1; /* Interrupt */
}
/* Either the sleep wasn't long enough (need a
short loop retrying?) or not interrupted at all
(in which case we should revisit the whole thing!)
Logging some warning would be nice. assert is not
viable as under the debugger, the various dialogs
mean the condition is not true.
*/
}
#endif /* MS_WINDOWS */
if (feof(fp)) {
return -1; /* EOF */
}
#ifdef EINTR
if (errno == EINTR) {
int s;
#ifdef WITH_THREAD
PyEval_RestoreThread(_PyOS_ReadlineTState);
#endif
s = PyErr_CheckSignals();
#ifdef WITH_THREAD
PyEval_SaveThread();
#endif
if (s < 0) {
return 1;
}
}
#endif
if (PyOS_InterruptOccurred()) { if (PyOS_InterruptOccurred()) {
return 1; /* Interrupt */ return 1; /* Interrupt */
} }
return -2; /* Error */ /* Either the sleep wasn't long enough (need a
short loop retrying?) or not interrupted at all
(in which case we should revisit the whole thing!)
Logging some warning would be nice. assert is not
viable as under the debugger, the various dialogs
mean the condition is not true.
*/
} }
/* NOTREACHED */ #endif /* MS_WINDOWS */
if (feof(fp)) {
return -1; /* EOF */
}
#ifdef EINTR
if (errno == EINTR) {
int s;
#ifdef WITH_THREAD
PyEval_RestoreThread(_PyOS_ReadlineTState);
#endif
s = PyErr_CheckSignals();
#ifdef WITH_THREAD
PyEval_SaveThread();
#endif
if (s < 0) {
return 1;
}
}
#endif
if (PyOS_InterruptOccurred()) {
return 1; /* Interrupt */
}
return -2; /* Error */
} }