]> granicus.if.org Git - python/commitdiff
Merge 3.2, Issue #17047: remove doubled words found in 2.7 to 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 11 Mar 2013 21:45:12 +0000 (17:45 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 11 Mar 2013 21:45:12 +0000 (17:45 -0400)
Modules/*, as reported by Serhiy Storchaka and Matthew Barnett.

1  2 
Modules/_ctypes/callproc.c
Modules/_ctypes/libffi/src/dlmalloc.c
Modules/_ctypes/libffi/src/ia64/ffi.c
Modules/_heapqmodule.c
Modules/_io/iobase.c
Modules/ossaudiodev.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index a17a647f26cba21525a5f4f64d0c29e12e1fd56a,0ac1cb37b9ff652ce9265b78838f3137bfd6bd1b..50e266f087f2e37256a4ae93d9d9780e226b9a17
@@@ -214,23 -214,8 +214,23 @@@ oss_mixer_dealloc(oss_mixer_t *self
   * Helper functions
   */
  
 +/* Check if a given file descriptor is valid (i.e. hasn't been closed).
 + * If true, return 1. Otherwise, raise ValueError and return 0.
 + */
 +static int _is_fd_valid(int fd)
 +{
 +    /* the FD is set to -1 in oss_close()/oss_mixer_close() */
 +    if (fd >= 0) {
 +        return 1;
 +    } else {
 +        PyErr_SetString(PyExc_ValueError,
 +                        "Operation on closed OSS device.");
 +        return 0;
 +    }
 +}
 +
  /* _do_ioctl_1() is a private helper function used for the OSS ioctls --
-    SNDCTL_DSP_{SETFMT,CHANNELS,SPEED} -- that that are called from C
+    SNDCTL_DSP_{SETFMT,CHANNELS,SPEED} -- that are called from C
     like this:
       ioctl(fd, SNDCTL_DSP_cmd, &arg)