From 0cd2a615dd4b79cd80a2e7ed2938354ce302c4d5 Mon Sep 17 00:00:00 2001 From: ritt Date: Mon, 18 Sep 2023 14:37:35 +0200 Subject: [PATCH] Fixed compiler warnings, updated download instructions --- doc/download.html | 115 ++++++++++++++++++++++++---------------------- src/elogd.cxx | 29 ++---------- 2 files changed, 64 insertions(+), 80 deletions(-) diff --git a/doc/download.html b/doc/download.html index 49488213..9fd9728c 100755 --- a/doc/download.html +++ b/doc/download.html @@ -1,74 +1,79 @@ - ELOG download page - - - - - - + ELOG download page + + + + + +
  ELOG download page  

 Site map :  - [Home]  - [User's Guide]  - [Administrator's Guide]  - [FAQ]  - [Forum]  - [Wishlist]  - [Contributions]  - [DEMO]  - [Download]  +  [Home]  +  [User's Guide]  +  [Administrator's Guide]  +  [FAQ]  +  [Forum]  +  [Wishlist]  +  [Contributions]  +  [DEMO]  +  [Download] 

-ELOG is distributed both as source code and as precompiled binaries for -various platforms. In addition to major versions, minor releases are made -containing bug fixes or some new and not yet completely debugged code. This -is usually the case if some user asks for some new features, which are then -implemented and sent to the user for testing. The minor releases are named -x.y.z-r where r is the release number. -A web access -to the source code contains the complete development history of ELOG, plus -the newest fixes and features which might yet be in a release. -To check out the GIT repository, use:

- -git clone https://bitbucket.org/ritt/elog --recursive
-

- -Building elogd and installing it from the GIT repository works in the same way as building -it from the tarball. Issue in the elog directory a "make", followed by a "make install".

-News for each version can be seen in the -changelog

+

ELOG is distributed both as source code and as precompiled binaries for + various platforms. In addition to major versions, minor releases are made + containing bug fixes or some new and not yet completely debugged code. This + is usually the case if some user asks for some new features, which are then + implemented and sent to the user for testing. The minor releases are named + x.y.z-r where r is the release number. + A web access + to the source code contains the complete development history of ELOG, plus + the newest fixes and features which might yet be in a release. + To check out the GIT repository, use:

+

+ + git clone https://bitbucket.org/ritt/elog --recursive
+ +

-
ELOG source code

+

No tags are used, so it is recommended to always use the newest release from + the "master" branch.

-The source code is available as a good old TAR -file. Select elog-latest.tar.gz -unless you want to download a previous version. Untar the file with

+

Building elogd requires the CMake sysmte and is done in the traditional way:

+

+ + $ cd elog
+ $ mkdir build
+ $ cd build
+ $ cmake ..
+ $ make
+ +

- -tar -zxvf elog-latest.tar.gz -

+

This will put the executables elogd and elog into +the build directory, from where they can be moved to a system directory like /usr/local/sbin/elogd +

-and compile it with "make". Then follow the instructions on how to install the server -on a Linux system. +

News for each version can be seen in the + changelog +

-
Windows Binaries

+

Windows Binaries
+

-The windows binaries are distributed with an automatic -installer. Execute -the installer to install ELOG and to register the elogd server as a windows service. Previous -windows versions can be found here.

+ The windows binaries are distributed with an automatic + installer. Execute + the installer to install ELOG and to register the elogd server as a windows service. Previous + windows versions can be found here. +

+

+ Note that the windows binaries are very much outdated and will be updated once the develop gets + access again to a Windows PC. +

-
Linux Binaries

- -Linux binaries are distributed as a -RPM. For previous -versions check here. There are -also SRPMS. Thanks to Roger Kalt -there is also a Debian package.

diff --git a/src/elogd.cxx b/src/elogd.cxx index 849fb9dd..08be4e18 100755 --- a/src/elogd.cxx +++ b/src/elogd.cxx @@ -2820,7 +2820,7 @@ int parse_config_file(char *file_name) /* parse whole config file and store options in sorted list */ { char *str, *buffer, *p, *pstr; - int index, i, j, fh, length; + int i, j, fh, length; str = (char *)xmalloc(20000); @@ -2841,7 +2841,6 @@ int parse_config_file(char *file_name) /* search group */ p = buffer; - index = 0; do { if (*p == '#' || *p == ';') { /* skip comment */ @@ -2923,7 +2922,6 @@ int parse_config_file(char *file_name) // param_compare); n_lb_config++; - index++; } /* search for next line beginning */ @@ -17553,7 +17551,7 @@ void display_line(LOGBOOK *lbs, int message_id, int number, const char *mode, in file_name[MAX_PATH_LENGTH], *slist, *svalue, comment[256], param[80], subdir[256], attr[NAME_LENGTH]; const char *nowrap; char display[NAME_LENGTH], attr_icon[80]; - int i, j, n, i_line, index, colspan, n_attachments, line_len, thumb_status, max_line_len, n_lines, + int i, j, n, i_line, index, colspan, line_len, thumb_status, max_line_len, n_lines, max_n_lines; BOOL skip_comma; FILE *f; @@ -18220,21 +18218,6 @@ void display_line(LOGBOOK *lbs, int message_id, int number, const char *mode, in rsprintf("\n"); } - /* count number of attachments */ - n_attachments = 0; - if (show_attachments) { - for (index = 0; index < MAX_ATTACHMENTS; index++) { - if (attachment[index][0]) { - /* check if attachment is inlined */ - sprintf(str, "[img]elog:/%d[/img]", index + 1); - if (strieq(encoding, "ELCode") && stristr(text, str)) - continue; - - n_attachments++; - } - } - } - for (index = 0; index < MAX_ATTACHMENTS; index++) { if (show_attachments && attachment[index][0]) { @@ -23778,7 +23761,7 @@ void submit_elog_mirror(LOGBOOK *lbs) { /*------------------------------------------------------------------*/ void copy_to(LOGBOOK *lbs, int src_id, const char *dest_logbook, int move, int orig_id) { - int size, i, j, n, n_done, n_done_reply, n_reply, index, status, fh, source_id, message_id, + int size, i, j, n, n_reply, index, status, fh, source_id, message_id, thumb_status, next_id = 0; char str[2048], str2[1024], file_name[MAX_PATH_LENGTH], thumb_name[MAX_PATH_LENGTH], *attrib, date[80], *text, msg_str[32], in_reply_to[80], subdir[256], @@ -23804,7 +23787,7 @@ void copy_to(LOGBOOK *lbs, int src_id, const char *dest_logbook, int move, int o else n = isparam("nsel") ? atoi(getparam("nsel")) : 0; - n_done = n_done_reply = source_id = status = next_id = 0; + source_id = status = next_id = 0; for (index = 0; index < n; index++) { if (src_id) source_id = src_id; @@ -24001,16 +23984,12 @@ void copy_to(LOGBOOK *lbs, int src_id, const char *dest_logbook, int move, int o return; } - n_done++; - /* submit all replies */ n_reply = strbreak(reply_to, (char (*)[1500]) list, MAX_N_ATTR, ",", FALSE); for (i = 0; i < n_reply; i++) { copy_to(lbs, atoi(list + i * NAME_LENGTH), dest_logbook, move, message_id); } - n_done_reply += n_reply; - /* delete original message for move */ next_id = source_id; if (move && orig_id == 0) {