Commit 55ed9237 authored by Jim Fulton's avatar Jim Fulton

Updated indentation.

parent b3c584b7
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
FOR A PARTICULAR PURPOSE FOR A PARTICULAR PURPOSE
****************************************************************************/ ****************************************************************************/
#define BUCKETTEMPLATE_C "$Id$\n" #define BUCKETTEMPLATE_C "$Id$\n"
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
} \ } \
(INDEX) = _i; \ (INDEX) = _i; \
(ABSENT) = _cmp; \ (ABSENT) = _cmp; \
} }
/* /*
** _bucket_get ** _bucket_get
...@@ -96,7 +96,7 @@ _bucket_get(Bucket *self, PyObject *keyarg, int has_key) ...@@ -96,7 +96,7 @@ _bucket_get(Bucket *self, PyObject *keyarg, int has_key)
PyErr_SetObject(PyExc_KeyError, keyarg); PyErr_SetObject(PyExc_KeyError, keyarg);
} }
Done: Done:
PER_UNUSE(self); PER_UNUSE(self);
return r; return r;
...@@ -164,7 +164,7 @@ Bucket_grow(Bucket *self, int newsize, int noval) ...@@ -164,7 +164,7 @@ Bucket_grow(Bucket *self, int newsize, int noval)
self->size = newsize; self->size = newsize;
return 0; return 0;
Overflow: Overflow:
PyErr_NoMemory(); PyErr_NoMemory();
return -1; return -1;
} }
...@@ -418,7 +418,7 @@ _bucket_set(Bucket *self, PyObject *keyarg, PyObject *v, ...@@ -418,7 +418,7 @@ _bucket_set(Bucket *self, PyObject *keyarg, PyObject *v,
if (PER_CHANGED(self) >= 0) if (PER_CHANGED(self) >= 0)
result = 1; result = 1;
Done: Done:
PER_UNUSE(self); PER_UNUSE(self);
return result; return result;
} }
...@@ -602,7 +602,7 @@ Bucket_deleteNextBucket(Bucket *self) ...@@ -602,7 +602,7 @@ Bucket_deleteNextBucket(Bucket *self)
} }
result = 0; result = 0;
Done: Done:
PER_UNUSE(self); PER_UNUSE(self);
return result; return result;
} }
...@@ -642,7 +642,7 @@ Done: ...@@ -642,7 +642,7 @@ Done:
If low false, sets *offset to 1, returns 1. If low false, sets *offset to 1, returns 1.
The 1, 3 and 5 examples are the same when exclude_equal is true. The 1, 3 and 5 examples are the same when exclude_equal is true.
*/ */
static int static int
Bucket_findRangeEnd(Bucket *self, PyObject *keyarg, int low, int exclude_equal, Bucket_findRangeEnd(Bucket *self, PyObject *keyarg, int low, int exclude_equal,
int *offset) int *offset)
...@@ -679,7 +679,7 @@ Bucket_findRangeEnd(Bucket *self, PyObject *keyarg, int low, int exclude_equal, ...@@ -679,7 +679,7 @@ Bucket_findRangeEnd(Bucket *self, PyObject *keyarg, int low, int exclude_equal,
if (result) if (result)
*offset = i; *offset = i;
Done: Done:
PER_UNUSE(self); PER_UNUSE(self);
return result; return result;
} }
...@@ -1039,7 +1039,7 @@ bucket__p_deactivate(Bucket *self, PyObject *args, PyObject *keywords) ...@@ -1039,7 +1039,7 @@ bucket__p_deactivate(Bucket *self, PyObject *args, PyObject *keywords)
if (args && PyTuple_GET_SIZE(args) > 0) { if (args && PyTuple_GET_SIZE(args) > 0) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"_p_deactivate takes not positional arguments"); "_p_deactivate takes no positional arguments");
return NULL; return NULL;
} }
if (keywords) { if (keywords) {
...@@ -1088,7 +1088,7 @@ bucket_clear(Bucket *self, PyObject *args) ...@@ -1088,7 +1088,7 @@ bucket_clear(Bucket *self, PyObject *args)
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
err: err:
PER_UNUSE(self); PER_UNUSE(self);
return NULL; return NULL;
} }
...@@ -1338,7 +1338,7 @@ bucket_pop(Bucket *self, PyObject *args) ...@@ -1338,7 +1338,7 @@ bucket_pop(Bucket *self, PyObject *args)
if (Bucket_length(self) == 0) if (Bucket_length(self) == 0)
PyErr_SetString(PyExc_KeyError, "pop(): Bucket is empty"); PyErr_SetString(PyExc_KeyError, "pop(): Bucket is empty");
return NULL; return NULL;
} }
/* Search bucket self for key. This is the sq_contains slot of the /* Search bucket self for key. This is the sq_contains slot of the
* PySequenceMethods. * PySequenceMethods.
...@@ -1409,7 +1409,7 @@ buildBucketIter(Bucket *self, PyObject *args, PyObject *kw, char kind) ...@@ -1409,7 +1409,7 @@ buildBucketIter(Bucket *self, PyObject *args, PyObject *kw, char kind)
result = BTreeIter_new(items); /* win or lose, we're done */ result = BTreeIter_new(items); /* win or lose, we're done */
Py_DECREF(items); Py_DECREF(items);
Done: Done:
PER_UNUSE(self); PER_UNUSE(self);
return (PyObject *)result; return (PyObject *)result;
} }
...@@ -1487,7 +1487,7 @@ _bucket__p_resolveConflict(PyObject *ob_type, PyObject *s[3]) ...@@ -1487,7 +1487,7 @@ _bucket__p_resolveConflict(PyObject *ob_type, PyObject *s[3])
else else
result = bucket_merge(b[0], b[1], b[2]); result = bucket_merge(b[0], b[1], b[2]);
Done: Done:
Py_XDECREF(meth); Py_XDECREF(meth);
Py_XDECREF(a); Py_XDECREF(a);
Py_XDECREF(b[0]); Py_XDECREF(b[0]);
...@@ -1667,7 +1667,7 @@ bucket_traverse(Bucket *self, visitproc visit, void *arg) ...@@ -1667,7 +1667,7 @@ bucket_traverse(Bucket *self, visitproc visit, void *arg)
VISIT(self->next); VISIT(self->next);
Done: Done:
return err; return err;
#undef VISIT #undef VISIT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment