tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more fbsd4 tweaks: Release 1.4.2

Browse Source
This commit is contained in:
dockes 2006-05-02 09:49:06 +00:00
parent 56bbd19389
commit 197514bbbf
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qtgui/guiutils.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.10 2006-04-27 09:23:10 dockes Exp $ (C) 2005 Jean-Francois Dockes"; static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.11 2006-05-02 09:49:06 dockes Exp $ (C) 2005 Jean-Francois Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -19,6 +19,8 @@ static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.10 2006-04-27 09:23:10 dockes Ex
*/ */
#include <unistd.h> #include <unistd.h>
#include <algorithm>
#include "debuglog.h" #include "debuglog.h"
#include "smallut.h" #include "smallut.h"
#include "recoll.h" #include "recoll.h"
@ -30,7 +32,7 @@ static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.10 2006-04-27 09:23:10 dockes Ex
#include <qsettings.h> #include <qsettings.h>
#include <qstringlist.h> #include <qstringlist.h>
const static char *htmlbrowserlist = static const char *htmlbrowserlist =
"opera konqueror firefox mozilla netscape"; "opera konqueror firefox mozilla netscape";
/** /**
@ -190,8 +192,9 @@ void rwSettings(bool writing)
dit++) { dit++) {
string dbdir = path_canon(*dit); string dbdir = path_canon(*dit);
path_catslash(dbdir); path_catslash(dbdir);
if (find(prefs.allExtraDbs.begin(), prefs.allExtraDbs.end(), if (std::find(prefs.allExtraDbs.begin(),
dbdir) != prefs.allExtraDbs.end()) prefs.allExtraDbs.end(), dbdir) !=
prefs.allExtraDbs.end())
continue; continue;
if (!Rcl::Db::testDbDir(dbdir)) { if (!Rcl::Db::testDbDir(dbdir)) {
LOGERR(("Not a xapian database: [%s]\n", dbdir.c_str())); LOGERR(("Not a xapian database: [%s]\n", dbdir.c_str()));

8
src/rcldb/stemdb.cpp
View File

@ -1,7 +1,13 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: stemdb.cpp,v 1.1 2006-04-13 09:50:03 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: stemdb.cpp,v 1.2 2006-05-02 09:49:06 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/**
* Management of the auxiliary databases listing stems and their expansion
* terms
*/
#include <unistd.h>
#include <algorithm> #include <algorithm>
#include <map> #include <map>

3
src/unac/unac.c
View File

@ -13221,8 +13221,9 @@ int unacmaybefold_string_utf16(const char* in, size_t in_length,
* is not valid any more. We have to do the freeing and zero out *outp * is not valid any more. We have to do the freeing and zero out *outp
*/ */
if(out_length + ((l + 1) * 2) > out_size) { if(out_length + ((l + 1) * 2) > out_size) {
char *saved;
out_size += ((l + 1) * 2) + 1024; out_size += ((l + 1) * 2) + 1024;
char *saved = out; saved = out;
out = realloc(out, out_size); out = realloc(out, out_size);
if(out == 0) { if(out == 0) {
if(debug_level >= UNAC_DEBUG_LOW) if(debug_level >= UNAC_DEBUG_LOW)