Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-12 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run indent

Browse Source 
SVN revision: 2455
This commit is contained in:
Stefan Ritt 2012-04-27 13:39:05 +00:00
parent 800f6a6c9a
commit e73d03ddd6
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/elogd.c
View File

@ -8665,8 +8665,8 @@ void get_auto_index(LOGBOOK * lbs, int index, char *format, char *retstr, int si
if (p == NULL) if (p == NULL)
return; return;
if (p > retstr && *(p-1) == '\\') { // escape if (p > retstr && *(p - 1) == '\\') { // escape
memmove(p-1, p, strlen(p)+1); memmove(p - 1, p, strlen(p) + 1);
return; return;
} }
@ -11343,7 +11343,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
display_inline = is_image(file_name) || is_ascii(file_name); display_inline = is_image(file_name) || is_ascii(file_name);
if (chkext(file_name, ".ps") || chkext(file_name, ".pdf") || chkext(file_name, ".eps") if (chkext(file_name, ".ps") || chkext(file_name, ".pdf") || chkext(file_name, ".eps")
|| chkext(file_name, ".svg")) || chkext(file_name, ".svg"))
display_inline = 0; display_inline = 0;
if ((chkext(file_name, ".htm") || chkext(file_name, ".html")) && is_full_html(file_name)) if ((chkext(file_name, ".htm") || chkext(file_name, ".html")) && is_full_html(file_name))
display_inline = 0; display_inline = 0;
@ -17406,7 +17406,8 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, int exp
my_strftime(str, sizeof(str), format, pts); my_strftime(str, sizeof(str), format, pts);
if (disp_attr_link == NULL || disp_attr_link[index]) if (disp_attr_link == NULL || disp_attr_link[index])
rsprintf("\n<td class=\"%s\" %s><a href=\"%s\">%s</a></td>\n", tdstyle, nowrap, ref, str); rsprintf("\n<td class=\"%s\" %s><a href=\"%s\">%s</a></td>\n", tdstyle, nowrap, ref,
str);
else else
rsprintf("\n<td class=\"%s\" %s>%s</td>\n", tdstyle, nowrap, str); rsprintf("\n<td class=\"%s\" %s>%s</td>\n", tdstyle, nowrap, str);
} }
@ -17425,7 +17426,8 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, int exp
my_strftime(str, sizeof(str), format, pts); my_strftime(str, sizeof(str), format, pts);
if (disp_attr_link == NULL || disp_attr_link[index]) if (disp_attr_link == NULL || disp_attr_link[index])
rsprintf("\n<td class=\"%s\" %s><a href=\"%s\">%s</a></td>\n", tdstyle, nowrap, ref, str); rsprintf("\n<td class=\"%s\" %s><a href=\"%s\">%s</a></td>\n", tdstyle, nowrap, ref,
str);
else else
rsprintf("\n<td class=\"%s\" %s>%s</td>\n", tdstyle, nowrap, str); rsprintf("\n<td class=\"%s\" %s>%s</td>\n", tdstyle, nowrap, str);
} }
@ -18960,7 +18962,7 @@ time_t convert_date(char *date_string)
time_t convert_datetime(char *date_string) time_t convert_datetime(char *date_string)
{ {
/* convert date string in MM/DD/YY h:m:s AM/PM or DD.MM.YY hh:m:s format into Unix time */ /* convert date string in MM/DD/YY h:m:s AM/PM or DD.MM.YY hh:m:s format into Unix time */
int year, month, day, hour, min=0, sec=0; int year, month, day, hour, min = 0, sec = 0;
char *p, str[256]; char *p, str[256];
struct tm tms; struct tm tms;
time_t ltime; time_t ltime;
@ -20820,12 +20822,11 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
subst_param(ref, sizeof(ref), "rsort", str); subst_param(ref, sizeof(ref), "rsort", str);
} else { } else {
if (ref[0] == 0) { if (ref[0] == 0) {
if (getcfg(lbs->name, "Reverse sort", str2, sizeof(str2)) && if (getcfg(lbs->name, "Reverse sort", str2, sizeof(str2)) && atoi(str2) == 1)
atoi(str2) == 1)
sprintf(ref, "?rsort=%s", str); sprintf(ref, "?rsort=%s", str);
else else
sprintf(ref, "?sort=%s", str); sprintf(ref, "?sort=%s", str);
} else{ } else {
subst_param(ref, sizeof(ref), "rsort", ""); subst_param(ref, sizeof(ref), "rsort", "");
subst_param(ref, sizeof(ref), "sort", str); subst_param(ref, sizeof(ref), "sort", str);
} }
@ -24836,11 +24837,10 @@ PMXML_NODE load_password_file(LOGBOOK * lbs, char *error, int error_size)
strlcpy(error, str, error_size); strlcpy(error, str, error_size);
return NULL; return NULL;
} }
#ifdef OS_WINNT #ifdef OS_WINNT
if ((st.st_mode & _S_IWRITE) == 0) { if ((st.st_mode & _S_IWRITE) == 0) {
#else #else
if ((st.st_mode & S_IWUSR) == 0) { if ((st.st_mode & S_IWUSR) == 0) {
#endif #endif
sprintf(str, "Cannot access write protected password file \"%s\"", file_name); sprintf(str, "Cannot access write protected password file \"%s\"", file_name);
strlcpy(error, str, error_size); strlcpy(error, str, error_size);
@ -28927,7 +28927,7 @@ void server_loop(void)
continue; continue;
} }
/* repeat until empty line received (fragmented TCP packets!) */ /* repeat until empty line received (fragmented TCP packets!) */
} while (strstr(net_buffer, "\r\n\r\n") == 0); } while (strstr(net_buffer, "\r\n\r\n") == 0);
} }