Fixed a number of recollinit invocations. Most in dead/test code

This commit is contained in:
Jean-Francois Dockes 2019-03-21 15:28:02 +01:00
parent 117207c6ca
commit 35d2d5bf49
9 changed files with 9 additions and 9 deletions

View File

@ -1 +1 @@
1.25.7 1.25.8

View File

@ -573,7 +573,7 @@ int main(int argc, char **argv)
Usage(); Usage();
string reason; string reason;
rclconfig = recollinit(0, 0, reason); rclconfig = recollinit(0, 0, 0, reason);
if (!rclconfig || !rclconfig->ok()) { if (!rclconfig || !rclconfig->ok()) {
fprintf(stderr, "Configuration problem: %s\n", reason.c_str()); fprintf(stderr, "Configuration problem: %s\n", reason.c_str());
exit(1); exit(1);

View File

@ -1907,7 +1907,7 @@ int main(int argc, char **argv)
Usage(); Usage();
string reason; string reason;
RclConfig *config = recollinit(0, 0, reason); RclConfig *config = recollinit(0, 0, 0, reason);
if (config == 0 || !config->ok()) { if (config == 0 || !config->ok()) {
cerr << "Configuration problem: " << reason << endl; cerr << "Configuration problem: " << reason << endl;
exit(1); exit(1);

View File

@ -223,7 +223,7 @@ using namespace std;
int main(int argc, const char **argv) int main(int argc, const char **argv)
{ {
string reason; string reason;
RclConfig *config = recollinit(0, 0, reason); RclConfig *config = recollinit(0, 0, 0, reason);
if (config == 0 || !config->ok()) { if (config == 0 || !config->ok()) {
string str = "Configuration problem: "; string str = "Configuration problem: ";

View File

@ -110,7 +110,7 @@ int main(int argc, char **argv)
Usage(); Usage();
top = *argv++;argc--; top = *argv++;argc--;
string reason; string reason;
RclConfig *config = recollinit(0, 0, reason, 0); RclConfig *config = recollinit(0, 0, 0, reason, 0);
if (!config || !config->ok()) { if (!config || !config->ok()) {
fprintf(stderr, "Recoll init failed: %s\n", reason.c_str()); fprintf(stderr, "Recoll init failed: %s\n", reason.c_str());
exit(1); exit(1);

View File

@ -1216,7 +1216,7 @@ int main(int argc, char **argv)
argc--; argc--;
} }
string reason; string reason;
config = recollinit(0, 0, reason); config = recollinit(0, 0, 0, reason);
if (config == 0 || !config->ok()) { if (config == 0 || !config->ok()) {
string str = "Configuration problem: "; string str = "Configuration problem: ";

View File

@ -56,7 +56,7 @@ RecollProtocol::RecollProtocol(const QByteArray &pool, const QByteArray &app)
{ {
kDebug() << endl; kDebug() << endl;
if (o_rclconfig == 0) { if (o_rclconfig == 0) {
o_rclconfig = recollinit(0, 0, m_reason); o_rclconfig = recollinit(0, 0, 0, m_reason);
if (!o_rclconfig || !o_rclconfig->ok()) { if (!o_rclconfig || !o_rclconfig->ok()) {
m_reason = string("Configuration problem: ") + m_reason; m_reason = string("Configuration problem: ") + m_reason;
return; return;

View File

@ -53,7 +53,7 @@ RecollProtocol::RecollProtocol(const QByteArray& pool, const QByteArray& app)
{ {
qDebug() << "RecollProtocol::RecollProtocol()"; qDebug() << "RecollProtocol::RecollProtocol()";
if (o_rclconfig == 0) { if (o_rclconfig == 0) {
o_rclconfig = recollinit(0, 0, m_reason); o_rclconfig = recollinit(0, 0, 0, m_reason);
if (!o_rclconfig || !o_rclconfig->ok()) { if (!o_rclconfig || !o_rclconfig->ok()) {
m_reason = string("Configuration problem: ") + m_reason; m_reason = string("Configuration problem: ") + m_reason;
return; return;

View File

@ -105,7 +105,7 @@ PHP_METHOD(Query, query)
} }
string qs = qs_c; string qs = qs_c;
RclConfig *rclconfig = recollinit(0, 0, reason, &a_config); RclConfig *rclconfig = recollinit(0, 0, 0, reason, &a_config);
if (!rclconfig || !rclconfig->ok()) { if (!rclconfig || !rclconfig->ok()) {
fprintf(stderr, "Recoll init failed: %s\n", reason.c_str()); fprintf(stderr, "Recoll init failed: %s\n", reason.c_str());
RETURN_BOOL(false); RETURN_BOOL(false);