=================================================================== RCS file: /cvs/mandoc/mansearch.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- mandoc/mansearch.c 2012/06/08 14:14:30 1.2 +++ mandoc/mansearch.c 2012/06/08 15:06:28 1.3 @@ -1,4 +1,4 @@ -/* $Id: mansearch.c,v 1.2 2012/06/08 14:14:30 kristaps Exp $ */ +/* $Id: mansearch.c,v 1.3 2012/06/08 15:06:28 kristaps Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons * @@ -38,11 +38,11 @@ #include "mandocdb.h" #include "mansearch.h" -#define BIND_TEXT(_db, _s, _i, _v) \ +#define SQL_BIND_TEXT(_db, _s, _i, _v) \ if (SQLITE_OK != sqlite3_bind_text \ ((_s), (_i)++, (_v), -1, SQLITE_STATIC)) \ fprintf(stderr, "%s\n", sqlite3_errmsg((_db))) -#define BIND_INT64(_db, _s, _i, _v) \ +#define SQL_BIND_INT64(_db, _s, _i, _v) \ if (SQLITE_OK != sqlite3_bind_int64 \ ((_s), (_i)++, (_v))) \ fprintf(stderr, "%s\n", sqlite3_errmsg((_db))) @@ -208,13 +208,13 @@ mansearch(const struct manpaths *paths, fprintf(stderr, "%s\n", sqlite3_errmsg(db)); if (NULL != arch) - BIND_TEXT(db, s, j, arch); + SQL_BIND_TEXT(db, s, j, arch); if (NULL != sec) - BIND_TEXT(db, s, j, arch); + SQL_BIND_TEXT(db, s, j, arch); for (ep = e; NULL != ep; ep = ep->next) { - BIND_TEXT(db, s, j, ep->v); - BIND_INT64(db, s, j, ep->bits); + SQL_BIND_TEXT(db, s, j, ep->v); + SQL_BIND_INT64(db, s, j, ep->bits); } memset(&htab, 0, sizeof(struct ohash));