Fix indentation.

This commit is contained in:
Dianne Skoll
2024-12-10 11:00:13 -05:00
parent 585d45e4a1
commit 9500a929ea
+105 -105
View File
@@ -347,27 +347,27 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
} }
switch(UPPER(c)) { switch(UPPER(c)) {
case 'A': case 'A':
if (altmode == '*' || !strcmp(DynamicOn, "")) { if (altmode == '*' || !strcmp(DynamicOn, "")) {
snprintf(s, sizeof(s), "%s, %d %s, %d", get_day_name(dse%7), d, snprintf(s, sizeof(s), "%s, %d %s, %d", get_day_name(dse%7), d,
get_month_name(m), y); get_month_name(m), y);
} else { } else {
snprintf(s, sizeof(s), "%s %s, %d %s, %d", DynamicOn, get_day_name(dse%7), d, snprintf(s, sizeof(s), "%s %s, %d %s, %d", DynamicOn, get_day_name(dse%7), d,
get_month_name(m), y); get_month_name(m), y);
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'B': case 'B':
snprintf(s, sizeof(s), "in %d days' time", diff); snprintf(s, sizeof(s), "in %d days' time", diff);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'C': case 'C':
if (altmode == '*' || !strcmp(DynamicOn, "")) { if (altmode == '*' || !strcmp(DynamicOn, "")) {
snprintf(s, sizeof(s), "%s", get_day_name(dse%7)); snprintf(s, sizeof(s), "%s", get_day_name(dse%7));
} else { } else {
snprintf(s, sizeof(s), "%s %s", DynamicOn, get_day_name(dse%7)); snprintf(s, sizeof(s), "%s %s", DynamicOn, get_day_name(dse%7));
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
@@ -397,224 +397,224 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
break; break;
case 'G': case 'G':
if (altmode == '*' || !strcmp(DynamicOn, "")) { if (altmode == '*' || !strcmp(DynamicOn, "")) {
snprintf(s, sizeof(s), "%s, %d %s", get_day_name(dse%7), d, get_month_name(m)); snprintf(s, sizeof(s), "%s, %d %s", get_day_name(dse%7), d, get_month_name(m));
} else { } else {
snprintf(s, sizeof(s), "%s %s, %d %s", DynamicOn, get_day_name(dse%7), d, get_month_name(m)); snprintf(s, sizeof(s), "%s %s, %d %s", DynamicOn, get_day_name(dse%7), d, get_month_name(m));
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'H': case 'H':
if (altmode == '*' || !strcmp(DynamicOn, "")) { if (altmode == '*' || !strcmp(DynamicOn, "")) {
snprintf(s, sizeof(s), "%02d%c%02d", d, DateSep, m+1); snprintf(s, sizeof(s), "%02d%c%02d", d, DateSep, m+1);
} else { } else {
snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicOn, d, DateSep, m+1); snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicOn, d, DateSep, m+1);
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'I': case 'I':
if (altmode == '*' || !strcmp(DynamicOn, "")) { if (altmode == '*' || !strcmp(DynamicOn, "")) {
snprintf(s, sizeof(s), "%02d%c%02d", m+1, DateSep, d); snprintf(s, sizeof(s), "%02d%c%02d", m+1, DateSep, d);
} else { } else {
snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicOn, m+1, DateSep, d); snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicOn, m+1, DateSep, d);
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'J': case 'J':
if (altmode == '*' || !strcmp(DynamicOn, "")) { if (altmode == '*' || !strcmp(DynamicOn, "")) {
snprintf(s, sizeof(s), "%s, %s %d%s, %d", get_day_name(dse%7), snprintf(s, sizeof(s), "%s, %s %d%s, %d", get_day_name(dse%7),
get_month_name(m), d, plu, y); get_month_name(m), d, plu, y);
} else { } else {
snprintf(s, sizeof(s), "%s %s, %s %d%s, %d", DynamicOn, get_day_name(dse%7), snprintf(s, sizeof(s), "%s %s, %s %d%s, %d", DynamicOn, get_day_name(dse%7),
get_month_name(m), d, plu, y); get_month_name(m), d, plu, y);
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'K': case 'K':
if (altmode == '*' || !strcmp(DynamicOn, "")) { if (altmode == '*' || !strcmp(DynamicOn, "")) {
snprintf(s, sizeof(s), "%s, %s %d%s", get_day_name(dse%7), snprintf(s, sizeof(s), "%s, %s %d%s", get_day_name(dse%7),
get_month_name(m), d, plu); get_month_name(m), d, plu);
} else { } else {
snprintf(s, sizeof(s), "%s %s, %s %d%s", DynamicOn, get_day_name(dse%7), snprintf(s, sizeof(s), "%s %s, %s %d%s", DynamicOn, get_day_name(dse%7),
get_month_name(m), d, plu); get_month_name(m), d, plu);
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'L': case 'L':
if (altmode == '*' || !strcmp(DynamicOn, "")) { if (altmode == '*' || !strcmp(DynamicOn, "")) {
snprintf(s, sizeof(s), "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d); snprintf(s, sizeof(s), "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d);
} else { } else {
snprintf(s, sizeof(s), "%s %04d%c%02d%c%02d", DynamicOn, y, DateSep, m+1, DateSep, d); snprintf(s, sizeof(s), "%s %04d%c%02d%c%02d", DynamicOn, y, DateSep, m+1, DateSep, d);
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'M': case 'M':
snprintf(s, sizeof(s), "%s", get_month_name(m)); snprintf(s, sizeof(s), "%s", get_month_name(m));
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'N': case 'N':
snprintf(s, sizeof(s), "%d", m+1); snprintf(s, sizeof(s), "%d", m+1);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'O': case 'O':
if (RealToday == DSEToday) snprintf(s, sizeof(s), " (%s)", DynamicToday); if (RealToday == DSEToday) snprintf(s, sizeof(s), " (%s)", DynamicToday);
else *s = 0; else *s = 0;
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'P': case 'P':
snprintf(s, sizeof(s), "%s", (diff == 1 ? "" : "s")); snprintf(s, sizeof(s), "%s", (diff == 1 ? "" : "s"));
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'Q': case 'Q':
snprintf(s, sizeof(s), "%s", (diff == 1 ? "'s" : "s'")); snprintf(s, sizeof(s), "%s", (diff == 1 ? "'s" : "s'"));
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'R': case 'R':
snprintf(s, sizeof(s), "%02d", d); snprintf(s, sizeof(s), "%02d", d);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'S': case 'S':
snprintf(s, sizeof(s), "%s", plu); snprintf(s, sizeof(s), "%s", plu);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'T': case 'T':
snprintf(s, sizeof(s), "%02d", m+1); snprintf(s, sizeof(s), "%02d", m+1);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'U': case 'U':
if (altmode == '*' || !strcmp(DynamicOn, "")) { if (altmode == '*' || !strcmp(DynamicOn, "")) {
snprintf(s, sizeof(s), "%s, %d%s %s, %d", get_day_name(dse%7), d, snprintf(s, sizeof(s), "%s, %d%s %s, %d", get_day_name(dse%7), d,
plu, get_month_name(m), y); plu, get_month_name(m), y);
} else { } else {
snprintf(s, sizeof(s), "%s %s, %d%s %s, %d", DynamicOn, get_day_name(dse%7), d, snprintf(s, sizeof(s), "%s %s, %d%s %s, %d", DynamicOn, get_day_name(dse%7), d,
plu, get_month_name(m), y); plu, get_month_name(m), y);
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'V': case 'V':
if (altmode == '*' || !strcmp(DynamicOn, "")) { if (altmode == '*' || !strcmp(DynamicOn, "")) {
snprintf(s, sizeof(s), "%s, %d%s %s", get_day_name(dse%7), d, plu, snprintf(s, sizeof(s), "%s, %d%s %s", get_day_name(dse%7), d, plu,
get_month_name(m)); get_month_name(m));
} else { } else {
snprintf(s, sizeof(s), "%s %s, %d%s %s", DynamicOn, get_day_name(dse%7), d, plu, snprintf(s, sizeof(s), "%s %s, %d%s %s", DynamicOn, get_day_name(dse%7), d, plu,
get_month_name(m)); get_month_name(m));
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'W': case 'W':
snprintf(s, sizeof(s), "%s", get_day_name(dse%7)); snprintf(s, sizeof(s), "%s", get_day_name(dse%7));
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'X': case 'X':
snprintf(s, sizeof(s), "%d", diff); snprintf(s, sizeof(s), "%d", diff);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'Y': case 'Y':
snprintf(s, sizeof(s), "%d", y); snprintf(s, sizeof(s), "%d", y);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case 'Z': case 'Z':
snprintf(s, sizeof(s), "%d", y % 100); snprintf(s, sizeof(s), "%d", y % 100);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '1': case '1':
if (tdiff == 0) if (tdiff == 0)
snprintf(s, sizeof(s), "%s", DynamicNow); snprintf(s, sizeof(s), "%s", DynamicNow);
else if (hdiff == 0) else if (hdiff == 0)
snprintf(s, sizeof(s), "%d %s%s %s", mdiff, DynamicMinute, mplu, when); snprintf(s, sizeof(s), "%d %s%s %s", mdiff, DynamicMinute, mplu, when);
else if (mdiff == 0) else if (mdiff == 0)
snprintf(s, sizeof(s), "%d %s%s %s", hdiff, DynamicHour, hplu, when); snprintf(s, sizeof(s), "%d %s%s %s", hdiff, DynamicHour, hplu, when);
else else
snprintf(s, sizeof(s), "%d %s%s %s %d %s%s %s", hdiff, DynamicHour, hplu, snprintf(s, sizeof(s), "%d %s%s %s %d %s%s %s", hdiff, DynamicHour, hplu,
DynamicAnd, mdiff, DynamicMinute, mplu, when); DynamicAnd, mdiff, DynamicMinute, mplu, when);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '2': case '2':
if (altmode == '*') { if (altmode == '*') {
snprintf(s, sizeof(s), "%d%c%02d%s", hh, TimeSep, min, pm); snprintf(s, sizeof(s), "%d%c%02d%s", hh, TimeSep, min, pm);
} else { } else {
snprintf(s, sizeof(s), "%s %d%c%02d%s", DynamicAt, hh, TimeSep, min, pm); snprintf(s, sizeof(s), "%s %d%c%02d%s", DynamicAt, hh, TimeSep, min, pm);
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '3': case '3':
if (altmode == '*') { if (altmode == '*') {
snprintf(s, sizeof(s), "%02d%c%02d", h, TimeSep, min); snprintf(s, sizeof(s), "%02d%c%02d", h, TimeSep, min);
} else { } else {
snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicAt, h, TimeSep, min); snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicAt, h, TimeSep, min);
} }
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '4': case '4':
snprintf(s, sizeof(s), "%d", tdiff); snprintf(s, sizeof(s), "%d", tdiff);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '5': case '5':
snprintf(s, sizeof(s), "%d", adiff); snprintf(s, sizeof(s), "%d", adiff);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '6': case '6':
snprintf(s, sizeof(s), "%s", when); snprintf(s, sizeof(s), "%s", when);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '7': case '7':
snprintf(s, sizeof(s), "%d", hdiff); snprintf(s, sizeof(s), "%d", hdiff);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '8': case '8':
snprintf(s, sizeof(s), "%d", mdiff); snprintf(s, sizeof(s), "%d", mdiff);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '9': case '9':
snprintf(s, sizeof(s), "%s", mplu); snprintf(s, sizeof(s), "%s", mplu);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '0': case '0':
snprintf(s, sizeof(s), "%s", hplu); snprintf(s, sizeof(s), "%s", hplu);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '!': case '!':
snprintf(s, sizeof(s), "%s", (tdiff >= 0 ? DynamicIs : DynamicWas)); snprintf(s, sizeof(s), "%s", (tdiff >= 0 ? DynamicIs : DynamicWas));
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '@': case '@':
snprintf(s, sizeof(s), "%d%c%02d%s", chh, TimeSep, cmin, cpm); snprintf(s, sizeof(s), "%d%c%02d%s", chh, TimeSep, cmin, cpm);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
case '#': case '#':
snprintf(s, sizeof(s), "%02d%c%02d", ch, TimeSep, cmin); snprintf(s, sizeof(s), "%02d%c%02d", ch, TimeSep, cmin);
SHIP_OUT(s); SHIP_OUT(s);
break; break;
@@ -711,7 +711,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
/* */ /* */
/***************************************************************/ /***************************************************************/
int DoSubstFromString(char const *source, DynamicBuffer *dbuf, int DoSubstFromString(char const *source, DynamicBuffer *dbuf,
int dse, int tim) int dse, int tim)
{ {
Trigger tempTrig; Trigger tempTrig;
TimeTrig tempTime; TimeTrig tempTime;