summaryrefslogtreecommitdiff
path: root/PC
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-09-15 01:50:53 +0000
committerMartin Panter <vadmium+py@gmail.com>2016-09-15 01:50:53 +0000
commit5f75502a2ed490071514ab0361e1b406a7405de1 (patch)
tree500bc57bf5f2b3aa7337f651670a397aa391d358 /PC
parent12c8855d0969fbb776ab5ba9a031e058b6ccf5bf (diff)
downloadcpython-git-5f75502a2ed490071514ab0361e1b406a7405de1.tar.gz
Issue #24366: Fix indentation
Backports changes by Victor Stinner, Hirokazu Yamamoto, li4ick and Benjamin Peterson.
Diffstat (limited to 'PC')
-rw-r--r--PC/winsound.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/PC/winsound.c b/PC/winsound.c
index 05305d2a4f..f3c5be4e88 100644
--- a/PC/winsound.c
+++ b/PC/winsound.c
@@ -77,24 +77,23 @@ sound_playsound(PyObject *s, PyObject *args)
int length;
int ok;
- if(!PyArg_ParseTuple(args,"z#i:PlaySound",&sound,&length,&flags)) {
- return NULL;
+ if (!PyArg_ParseTuple(args, "z#i:PlaySound", &sound, &length, &flags)) {
+ return NULL;
}
- if(flags&SND_ASYNC && flags &SND_MEMORY) {
- /* Sidestep reference counting headache; unfortunately this also
- prevent SND_LOOP from memory. */
- PyErr_SetString(PyExc_RuntimeError,"Cannot play asynchronously from memory");
- return NULL;
+ if (flags & SND_ASYNC && flags & SND_MEMORY) {
+ /* Sidestep reference counting headache; unfortunately this also
+ prevent SND_LOOP from memory. */
+ PyErr_SetString(PyExc_RuntimeError, "Cannot play asynchronously from memory");
+ return NULL;
}
Py_BEGIN_ALLOW_THREADS
- ok = PlaySound(sound,NULL,flags);
+ ok = PlaySound(sound, NULL, flags);
Py_END_ALLOW_THREADS
- if(!ok)
- {
- PyErr_SetString(PyExc_RuntimeError,"Failed to play sound");
- return NULL;
+ if (!ok) {
+ PyErr_SetString(PyExc_RuntimeError, "Failed to play sound");
+ return NULL;
}
Py_INCREF(Py_None);
@@ -151,11 +150,10 @@ static struct PyMethodDef sound_methods[] =
static void
add_define(PyObject *dict, const char *key, long value)
{
- PyObject *k=PyString_FromString(key);
- PyObject *v=PyLong_FromLong(value);
- if(v&&k)
- {
- PyDict_SetItem(dict,k,v);
+ PyObject *k = PyString_FromString(key);
+ PyObject *v = PyLong_FromLong(value);
+ if (v && k) {
+ PyDict_SetItem(dict, k, v);
}
Py_XDECREF(k);
Py_XDECREF(v);