Skip to content

Commit 9ee0899

Browse files
committed
Convert initialised to bool
1 parent dbf7d44 commit 9ee0899

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

ext/sqlite3/php_sqlite3_structs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ typedef struct _php_sqlite3_collation {
6262

6363
/* Structure for SQLite Database object. */
6464
typedef struct _php_sqlite3_db_object {
65-
int initialised;
65+
bool initialised;
6666
sqlite3 *db;
6767
php_sqlite3_func *funcs;
6868
php_sqlite3_collation *collations;
@@ -114,7 +114,7 @@ struct _php_sqlite3_stmt_object {
114114
sqlite3_stmt *stmt;
115115
php_sqlite3_db_object *db_obj;
116116

117-
int initialised;
117+
bool initialised;
118118

119119
/* Keep track of the zvals for bound parameters */
120120
HashTable *bound_params;

ext/sqlite3/sqlite3.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ PHP_METHOD(SQLite3, open)
161161
}
162162
#endif
163163

164-
db_obj->initialised = 1;
164+
db_obj->initialised = true;
165165
db_obj->authorizer_fcc = empty_fcall_info_cache;
166166

167167
sqlite3_set_authorizer(db_obj->db, php_sqlite3_authorizer, db_obj);
@@ -199,7 +199,7 @@ PHP_METHOD(SQLite3, close)
199199
RETURN_FALSE;
200200
}
201201
}
202-
db_obj->initialised = 0;
202+
db_obj->initialised = false;
203203
}
204204

205205
RETURN_TRUE;
@@ -534,7 +534,7 @@ PHP_METHOD(SQLite3, prepare)
534534
RETURN_FALSE;
535535
}
536536

537-
stmt_obj->initialised = 1;
537+
stmt_obj->initialised = true;
538538

539539
zend_llist_add_element(&(db_obj->free_list), &stmt_obj);
540540
}
@@ -586,7 +586,7 @@ PHP_METHOD(SQLite3, query)
586586
RETURN_FALSE;
587587
}
588588

589-
stmt_obj->initialised = 1;
589+
stmt_obj->initialised = true;
590590

591591
object_init_ex(return_value, php_sqlite3_result_entry);
592592
result = Z_SQLITE3_RESULT_P(return_value);
@@ -610,7 +610,7 @@ PHP_METHOD(SQLite3, query)
610610
php_sqlite3_error(db_obj, sqlite3_errcode(db_obj->db), "Unable to execute statement: %s", sqlite3_errmsg(db_obj->db));
611611
}
612612
sqlite3_finalize(stmt_obj->stmt);
613-
stmt_obj->initialised = 0;
613+
stmt_obj->initialised = false;
614614
zval_ptr_dtor(return_value);
615615
RETURN_FALSE;
616616
}
@@ -1839,7 +1839,7 @@ PHP_METHOD(SQLite3Stmt, __construct)
18391839
zval_ptr_dtor(return_value);
18401840
RETURN_FALSE;
18411841
}
1842-
stmt_obj->initialised = 1;
1842+
stmt_obj->initialised = true;
18431843

18441844
zend_llist_add_element(&(db_obj->free_list), &stmt_obj);
18451845
}
@@ -2139,7 +2139,7 @@ static void php_sqlite3_free_list_dtor(void **item)
21392139

21402140
if (stmt_obj && stmt_obj->initialised) {
21412141
sqlite3_finalize(stmt_obj->stmt);
2142-
stmt_obj->initialised = 0;
2142+
stmt_obj->initialised = false;
21432143
}
21442144
}
21452145
/* }}} */
@@ -2197,7 +2197,7 @@ static void php_sqlite3_object_free_storage(zend_object *object) /* {{{ */
21972197

21982198
if (intern->initialised && intern->db) {
21992199
sqlite3_close(intern->db);
2200-
intern->initialised = 0;
2200+
intern->initialised = false;
22012201
}
22022202

22032203
zend_object_std_dtor(&intern->zo);

0 commit comments

Comments
 (0)