From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 3 May 2017 16:04:18 +0000 (+0200)
Subject: bpo-30257: _bsddb: Fix newDBObject() (#1428)
X-Git-Tag: v2.7.14rc1~180
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c27731901003cbcc64056fe9db725abe8484616;p=python

bpo-30257: _bsddb: Fix newDBObject() (#1428)

Don't set cursorSetReturnsNone to DEFAULT_CURSOR_SET_RETURNS_NONE
anymore if self->myenvobj is set.

Fix a GCC warning on the strange indentation.
---

diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index ed17d39f2e..9c81ec5217 100644
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -931,11 +931,13 @@ newDBObject(DBEnvObject* arg, int flags)
     self->sibling_prev_p_txn=NULL;
     self->sibling_next_txn=NULL;
 
-    if (self->myenvobj)
+    if (self->myenvobj) {
         self->moduleFlags = self->myenvobj->moduleFlags;
-    else
+    }
+    else {
         self->moduleFlags.getReturnsNone = DEFAULT_GET_RETURNS_NONE;
         self->moduleFlags.cursorSetReturnsNone = DEFAULT_CURSOR_SET_RETURNS_NONE;
+    }
 
     MYDB_BEGIN_ALLOW_THREADS;
     err = db_create(&self->db, db_env, flags);