Browse Source

Fix unintended rename of LOCKFILE

pull/21/head
Slávek Banko 8 years ago
parent
commit
b8daa96e44
  1. 6
      indexlib/lockfile.h
  2. 2
      kmail/accountdialog.cpp
  3. 8
      libtdenetwork/libgpgme-copy/assuan/assuan-logging.c

6
indexlib/lockfile.h

@ -1,5 +1,5 @@
#ifndef LPC_LOCTDEFILE_H1118420718_INCLUDE_GUARD_
#define LPC_LOCTDEFILE_H1118420718_INCLUDE_GUARD_
#ifndef LPC_LOCKFILE_H1118420718_INCLUDE_GUARD_
#define LPC_LOCKFILE_H1118420718_INCLUDE_GUARD_
/* This file is part of indexlib.
* Copyright (C) 2005 Luís Pedro Coelho <luis@luispedro.org>
@ -69,4 +69,4 @@ class lockfile {
#endif /* LPC_LOCTDEFILE_H1118420718_INCLUDE_GUARD_ */
#endif /* LPC_LOCKFILE_H1118420718_INCLUDE_GUARD_ */

2
kmail/accountdialog.cpp

@ -118,7 +118,7 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
mProcmailrc.setName(fname);
}
TQRegExp lockFileGlobal("^LOCTDEFILE=", true);
TQRegExp lockFileGlobal("^LOCKFILE=", true);
TQRegExp lockFileLocal("^:0", true);
if( mProcmailrc.open(IO_ReadOnly) ) {

8
libtdenetwork/libgpgme-copy/assuan/assuan-logging.c

@ -137,7 +137,7 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length)
fwrite (buffer, length, 1, fp);
else
{
#ifdef HAVE_FLOCTDEFILE
#ifdef HAVE_FLOCKFILE
flockfile (fp);
#endif
putc_unlocked ('[', fp);
@ -154,7 +154,7 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length)
}
putc_unlocked (' ', fp);
putc_unlocked (']', fp);
#ifdef HAVE_FUNLOCTDEFILE
#ifdef HAVE_FUNLOCKFILE
funlockfile (fp);
#endif
}
@ -171,7 +171,7 @@ _assuan_log_sanitized_string (const char *string)
if (! *s)
return;
#ifdef HAVE_FLOCTDEFILE
#ifdef HAVE_FLOCKFILE
flockfile (fp);
#endif
@ -218,7 +218,7 @@ _assuan_log_sanitized_string (const char *string)
}
}
#ifdef HAVE_FUNLOCTDEFILE
#ifdef HAVE_FUNLOCKFILE
funlockfile (fp);
#endif
}

Loading…
Cancel
Save