oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Util/Macros: replacement for GLib's G_N_ELEMENTS()

Browse Source
This commit is contained in:
Max Kellermann
2013-10-15 22:04:17 +02:00
parent 77429b6dd3
commit 509f8dab89
19 changed files with 100 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/StickerDatabase.cxx
View File

@@ -23,6 +23,7 @@
#include "Idle.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "util/Macros.hxx"
#include "Log.hxx"
#include <string>
@@ -79,7 +80,7 @@ static const char sticker_sql_create[] =
"";
static sqlite3 *sticker_db;
static sqlite3_stmt *sticker_stmt[G_N_ELEMENTS(sticker_sql)];
static sqlite3_stmt *sticker_stmt[ARRAY_SIZE(sticker_sql)];
static constexpr Domain sticker_domain("sticker");
@@ -138,7 +139,7 @@ sticker_global_init(Path &&path, Error &error)
/* prepare the statements we're going to use */
for (unsigned i = 0; i < G_N_ELEMENTS(sticker_sql); ++i) {
for (unsigned i = 0; i < ARRAY_SIZE(sticker_sql); ++i) {
assert(sticker_sql[i] != NULL);
sticker_stmt[i] = sticker_prepare(sticker_sql[i], error);
@@ -156,7 +157,7 @@ sticker_global_finish(void)
/* not configured */
return;
for (unsigned i = 0; i < G_N_ELEMENTS(sticker_stmt); ++i) {
for (unsigned i = 0; i < ARRAY_SIZE(sticker_stmt); ++i) {
assert(sticker_stmt[i] != NULL);
sqlite3_finalize(sticker_stmt[i]);