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

Merged revisions 66748 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66748 | christian.heimes | 2008-10-02 21:47:50 +0200 (Thu, 02 Oct 2008) | 1 line

  Fixed a couple more C99 comments and one occurence of inline.
........

+ another // comment in bytesobject
This commit is contained in:
Christian Heimes 2008-10-02 19:56:01 +00:00
parent c472532c0c
commit 1a8501c648
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_ctypes/libffi/src/x86/ffi.c
View File

@ -388,10 +388,10 @@ ffi_prep_raw_closure_loc (ffi_raw_closure* closure,
return FFI_BAD_ABI; return FFI_BAD_ABI;
} }
// we currently don't support certain kinds of arguments for raw /* we currently don't support certain kinds of arguments for raw
// closures. This should be implemented by a separate assembly language // closures. This should be implemented by a separate assembly language
// routine, since it would require argument processing, something we // routine, since it would require argument processing, something we
// don't do now for performance. // don't do now for performance. */
for (i = cif->nargs-1; i >= 0; i--) for (i = cif->nargs-1; i >= 0; i--)
{ {

2
Modules/signalmodule.c
View File

@ -107,7 +107,7 @@ timeval_from_double(double d, struct timeval *tv)
tv->tv_usec = fmod(d, 1.0) * 1000000.0; tv->tv_usec = fmod(d, 1.0) * 1000000.0;
} }
static inline double Py_LOCAL_INLINE(double)
double_from_timeval(struct timeval *tv) double_from_timeval(struct timeval *tv)
{ {
return tv->tv_sec + (double)(tv->tv_usec / 1000000.0); return tv->tv_sec + (double)(tv->tv_usec / 1000000.0);

2
Modules/tkappinit.c
View File

@ -71,7 +71,7 @@ Tcl_AppInit(Tcl_Interp *interp)
#endif #endif
#ifdef WITH_XXX #ifdef WITH_XXX
// Initialize modules that don't require Tk /* Initialize modules that don't require Tk */
#endif #endif
_tkinter_skip_tk_init = Tcl_GetVar(interp, "_tkinter_skip_tk_init", TCL_GLOBAL_ONLY); _tkinter_skip_tk_init = Tcl_GetVar(interp, "_tkinter_skip_tk_init", TCL_GLOBAL_ONLY);

2
Objects/bytesobject.c
View File

@ -2965,7 +2965,7 @@ PyBytes_FromObject(PyObject *x)
new = PyBytes_FromStringAndSize(NULL, view.len); new = PyBytes_FromStringAndSize(NULL, view.len);
if (!new) if (!new)
goto fail; goto fail;
// XXX(brett.cannon): Better way to get to internal buffer? /* XXX(brett.cannon): Better way to get to internal buffer? */
if (PyBuffer_ToContiguous(((PyBytesObject *)new)->ob_sval, if (PyBuffer_ToContiguous(((PyBytesObject *)new)->ob_sval,
&view, view.len, 'C') < 0) &view, view.len, 'C') < 0)
goto fail; goto fail;

30
Objects/unicodeobject.c
View File

@ -126,19 +126,19 @@ static const char unicode_default_encoding[] = "utf-8";
/* Fast detection of the most frequent whitespace characters */ /* Fast detection of the most frequent whitespace characters */
const unsigned char _Py_ascii_whitespace[] = { const unsigned char _Py_ascii_whitespace[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
// case 0x0009: /* HORIZONTAL TABULATION */ /* case 0x0009: * HORIZONTAL TABULATION */
// case 0x000A: /* LINE FEED */ /* case 0x000A: * LINE FEED */
// case 0x000B: /* VERTICAL TABULATION */ /* case 0x000B: * VERTICAL TABULATION */
// case 0x000C: /* FORM FEED */ /* case 0x000C: * FORM FEED */
// case 0x000D: /* CARRIAGE RETURN */ /* case 0x000D: * CARRIAGE RETURN */
0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
// case 0x001C: /* FILE SEPARATOR */ /* case 0x001C: * FILE SEPARATOR */
// case 0x001D: /* GROUP SEPARATOR */ /* case 0x001D: * GROUP SEPARATOR */
// case 0x001E: /* RECORD SEPARATOR */ /* case 0x001E: * RECORD SEPARATOR */
// case 0x001F: /* UNIT SEPARATOR */ /* case 0x001F: * UNIT SEPARATOR */
0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1,
// case 0x0020: /* SPACE */ /* case 0x0020: * SPACE */
1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -157,13 +157,13 @@ const unsigned char _Py_ascii_whitespace[] = {
/* Same for linebreaks */ /* Same for linebreaks */
static unsigned char ascii_linebreak[] = { static unsigned char ascii_linebreak[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
// 0x000A, /* LINE FEED */ /* 0x000A, * LINE FEED */
// 0x000D, /* CARRIAGE RETURN */ /* 0x000D, * CARRIAGE RETURN */
0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
// 0x001C, /* FILE SEPARATOR */ /* 0x001C, * FILE SEPARATOR */
// 0x001D, /* GROUP SEPARATOR */ /* 0x001D, * GROUP SEPARATOR */
// 0x001E, /* RECORD SEPARATOR */ /* 0x001E, * RECORD SEPARATOR */
0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

6
Python/_warnings.c
View File

@ -382,7 +382,7 @@ warn_explicit(PyObject *category, PyObject *message,
} }
} }
if (rc == 1) // Already warned for this module. */ if (rc == 1) /* Already warned for this module. */
goto return_none; goto return_none;
if (rc == 0) { if (rc == 0) {
PyObject *show_fxn = get_warnings_attr("showwarning"); PyObject *show_fxn = get_warnings_attr("showwarning");
@ -776,8 +776,8 @@ static PyMethodDef warnings_functions[] = {
warn_doc}, warn_doc},
{"warn_explicit", (PyCFunction)warnings_warn_explicit, {"warn_explicit", (PyCFunction)warnings_warn_explicit,
METH_VARARGS | METH_KEYWORDS, warn_explicit_doc}, METH_VARARGS | METH_KEYWORDS, warn_explicit_doc},
// XXX(brett.cannon): add showwarning? /* XXX(brett.cannon): add showwarning? */
// XXX(brett.cannon): Reasonable to add formatwarning? /* XXX(brett.cannon): Reasonable to add formatwarning? */
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };