Add source code module name to stdout/stderr messages to improve readability.

(cherry picked from commit e50a9f060c)
v3.5.13-sru
Darrell Anderson 13 years ago committed by Slávek Banko
parent 15177ca24a
commit 9cbbfe8fae

@ -476,7 +476,7 @@ bool KBuildSycoca::recreate()
} }
if (database->status() != 0) if (database->status() != 0)
{ {
fprintf(stderr, "kbuildsycoca: ERROR creating database '%s'! %s\n", path.local8Bit().data(),strerror(database->status())); fprintf(stderr, "[kbuildsycoca] ERROR creating database '%s'! %s\n", path.local8Bit().data(),strerror(database->status()));
#ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build
// GUI version of kbuildsycoca, so-called "kbuildsycocaw". // GUI version of kbuildsycoca, so-called "kbuildsycocaw".
if (!silent) if (!silent)
@ -505,11 +505,11 @@ bool KBuildSycoca::recreate()
m_str = 0L; m_str = 0L;
if (!database->close()) if (!database->close())
{ {
fprintf(stderr, "kbuildsycoca: ERROR writing database '%s'!\n", database->name().local8Bit().data()); fprintf(stderr, "[kbuildsycoca] ERROR writing database '%s'!\n", database->name().local8Bit().data());
fprintf(stderr, "kbuildsycoca: Disk full?\n"); fprintf(stderr, "[kbuildsycoca] Disk full?\n");
#ifdef KBUILDSYCOCA_GUI #ifdef KBUILDSYCOCA_GUI
if (!silent) if (!silent)
KMessageBox::error(0, i18n("Error writing database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca")); KMessageBox::error(0, i18n("[kbuildsycoca] Error writing database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca"));
#endif #endif
return false; return false;
} }
@ -777,14 +777,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
TQCString registeredName = dcopClient->registerAs(appName, false); TQCString registeredName = dcopClient->registerAs(appName, false);
if (registeredName.isEmpty()) if (registeredName.isEmpty())
{ {
fprintf(stderr, "Warning: %s is unable to register with DCOP.\n", appName); fprintf(stderr, "[kbuildsycoca] Warning: %s is unable to register with DCOP.\n", appName);
break; break;
} }
else if (registeredName == appName) else if (registeredName == appName)
{ {
break; // Go break; // Go
} }
fprintf(stderr, "Waiting for already running %s to finish.\n", appName); fprintf(stderr, "[kbuildsycoca] Waiting for already running %s to finish.\n", appName);
dcopClient->setNotifications( true ); dcopClient->setNotifications( true );
while (dcopClient->isApplicationRegistered(appName)) while (dcopClient->isApplicationRegistered(appName))
@ -796,7 +796,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
} }
dcopClient->setNotifications( false ); dcopClient->setNotifications( false );
} }
fprintf(stderr, "%s running...\n", appName); fprintf(stderr, "[kbuildsycoca] %s running...\n", appName);
bool checkfiles = bGlobalDatabase || args->isSet("checkfiles"); bool checkfiles = bGlobalDatabase || args->isSet("checkfiles");
@ -870,7 +870,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
g_ctimeDict = 0; g_ctimeDict = 0;
if (incremental) if (incremental)
{ {
qWarning("Reusing existing ksycoca"); qWarning("[kbuildsycoca] Reusing existing ksycoca.");
KSycoca *oldSycoca = KSycoca::self(); KSycoca *oldSycoca = KSycoca::self();
KSycocaFactoryList *factories = new KSycocaFactoryList; KSycocaFactoryList *factories = new KSycocaFactoryList;
g_allEntries = new KSycocaEntryListList; g_allEntries = new KSycocaEntryListList;
@ -950,7 +950,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
#ifdef KBUILDSYCOCA_GUI #ifdef KBUILDSYCOCA_GUI
if (!silent) { if (!silent) {
progress.close(); progress.close();
KMessageBox::information(0, i18n("Configuration information reloaded successfully."), capt); KMessageBox::information(0, i18n("[kbuildsycoca] Configuration information reloaded successfully."), capt);
} }
#endif #endif
return 0; return 0;

Loading…
Cancel
Save