3
0
Fork 0

Small beautifications of the code

small_fixes
kelson42 11 years ago
parent 63ec186e37
commit e629f59f6e

@ -371,7 +371,7 @@ static int accessHandlerCallback(void *cls,
acceptEncodingDeflate && acceptEncodingDeflate &&
(mimeType.find("text/") != string::npos || (mimeType.find("text/") != string::npos ||
mimeType.find("application/javascript") != string::npos || mimeType.find("application/javascript") != string::npos ||
mimeType.find("application/json") != string::npos ); mimeType.find("application/json") != string::npos);
/* Compress the content if necessary */ /* Compress the content if necessary */
if (deflated) { if (deflated) {
@ -456,7 +456,7 @@ int main(int argc, char **argv) {
kiwix::Manager libraryManager; kiwix::Manager libraryManager;
/* Argument parsing */ /* Argument parsing */
while (42) { while (true) {
static struct option long_options[] = { static struct option long_options[] = {
{"daemon", no_argument, 0, 'd'}, {"daemon", no_argument, 0, 'd'},
@ -524,9 +524,9 @@ int main(int argc, char **argv) {
for ( itr = libraryPaths.begin(); itr != libraryPaths.end(); ++itr ) { for ( itr = libraryPaths.begin(); itr != libraryPaths.end(); ++itr ) {
if (!itr->empty()) { if (!itr->empty()) {
bool retVal = false; bool retVal = false;
string libraryPath = isRelativePath(*itr) ? computeAbsolutePath(removeLastPathElement(getExecutablePath(), true, false), *itr) : *itr;
try { try {
string libraryPath = isRelativePath(*itr) ? computeAbsolutePath(removeLastPathElement(getExecutablePath(), true, false), *itr) : *itr;
retVal = libraryManager.readFile(libraryPath, true); retVal = libraryManager.readFile(libraryPath, true);
} catch (...) { } catch (...) {
retVal = false; retVal = false;
@ -620,7 +620,6 @@ int main(int argc, char **argv) {
</table>\n\n"; </table>\n\n";
} }
} }
welcomeHTML = replaceRegex(getResourceAsString("server/home.html.tmpl"), welcomeBooksHtml, "__BOOKS__"); welcomeHTML = replaceRegex(getResourceAsString("server/home.html.tmpl"), welcomeBooksHtml, "__BOOKS__");
#ifndef _WIN32 #ifndef _WIN32
@ -688,7 +687,7 @@ int main(int argc, char **argv) {
exit(1); exit(1);
} }
/* Run endless */ /* Run endless (until PPID dies) */
bool waiting = true; bool waiting = true;
do { do {
if (PPID > 0) { if (PPID > 0) {

Loading…
Cancel
Save