felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-17 23:08:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

More const stuff.

Browse Source
This commit is contained in:
Dianne Skoll
2025-07-21 18:46:31 -04:00
parent 609b68ab21
commit ea5e8c90ff
15 changed files with 45 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.in
View File

@@ -102,7 +102,7 @@ depend:
# distributions, etc.
cppcheck:
cppcheck -j`nproc` -v --force --enable=all --suppress=ConfigurationNotChecked --suppress=unmatchedSuppression --suppress=variableScope --inline-suppr .
cppcheck -j`nproc` -v --force --enable=all --suppress=missingIncludeSystem --suppress=ConfigurationNotChecked --suppress=unmatchedSuppression --suppress=variableScope --inline-suppr --check-level=exhaustive .
# Build a tar file based on all files checked into git.
distro:

8
src/calendar.c
View File

@@ -288,7 +288,7 @@ static int WriteCalendarRow (void);
static void WriteWeekHeaderLine (void);
static void WritePostHeaderLine (void);
static void PrintLeft (char const *s, int width, char pad);
static void PrintCentered (char const *s, int width, char *pad);
static void PrintCentered (char const *s, int width, char const *pad);
static int WriteOneCalLine (int dse, int wd);
static int WriteOneColLine (int col);
static void GenerateCalEntries (int col);
@@ -646,7 +646,7 @@ Colorize256(int r, int g, int b, int bg, int clamp)
int best = -1;
int best_dist = 0;
int dist;
struct xterm256_colors *cur;
struct xterm256_colors const *cur;
size_t i;
if (clamp) {
@@ -1387,7 +1387,7 @@ static void PrintLeft(char const *s, int width, char pad)
/* Center a piece of text */
/* */
/***************************************************************/
static void PrintCentered(char const *s, int width, char *pad)
static void PrintCentered(char const *s, int width, char const *pad)
{
#ifndef REM_USE_WCHAR
int len = strlen(s);
@@ -2342,7 +2342,7 @@ static int DoCalRem(ParsePtr p, int col)
return OK;
}
static void WriteSimpleEntryProtocol1(CalEntry *e)
static void WriteSimpleEntryProtocol1(CalEntry const *e)
{
if (e->passthru[0]) {
printf(" %s", e->passthru);

12
src/dorem.c
View File

@@ -29,8 +29,8 @@ static int ParseLocalOmit (ParsePtr s, Trigger *t);
static int ParseScanFrom (ParsePtr s, Trigger *t, int type);
static int ParsePriority (ParsePtr s, Trigger *t);
static int ParseUntil (ParsePtr s, Trigger *t, int type);
static int ShouldTriggerBasedOnWarn (Trigger *t, int dse, int *err);
static int ComputeTrigDuration(TimeTrig *t);
static int ShouldTriggerBasedOnWarn (Trigger const *t, int dse, int *err);
static int ComputeTrigDuration(TimeTrig const *t);
static int
ensure_expr_references_first_local_arg(expr_node *node)
@@ -179,7 +179,7 @@ static void ensure_satnode_mentions_trigdate(expr_node *node)
static int
ComputeTrigDuration(TimeTrig *t)
ComputeTrigDuration(TimeTrig const *t)
{
if (t->ttime == NO_TIME ||
t->duration == NO_TIME) {
@@ -1115,7 +1115,7 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
/* Trigger the reminder if it's a RUN or MSG type. */
/* */
/***************************************************************/
int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queued, DynamicBuffer *output)
int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig const *tim, int dse, int is_queued, DynamicBuffer *output)
{
int r, y, m, d;
int adjusted_for_newline = 0;
@@ -1427,7 +1427,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queue
/* triggered. Sets *err non-zero in event of an error. */
/* */
/***************************************************************/
int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int dse, int *err)
int ShouldTriggerReminder(Trigger const *t, TimeTrig const *tim, int dse, int *err)
{
int r, omit;
*err = 0;
@@ -1704,7 +1704,7 @@ finished:
/* function. */
/* */
/***************************************************************/
static int ShouldTriggerBasedOnWarn(Trigger *t, int dse, int *err)
static int ShouldTriggerBasedOnWarn(Trigger const *t, int dse, int *err)
{
char buffer[VAR_NAME_LEN+32];
int i;

2
src/dosubst.c
View File

@@ -54,7 +54,7 @@ check_subst_args(UserFunc *f, int n)
/* If mode==ADVANCE_MODE, ignore %" but don't add newline */
/* */
/***************************************************************/
int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse, int mode)
int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig const *tt, int dse, int mode)
{
int diff = dse - DSEToday;
int curtime = MinutesPastMidnight(0);

4
src/expr.c
View File

@@ -443,7 +443,7 @@ get_var(expr_node *node, Value *ans, int *nonconst)
/* */
/***************************************************************/
static int
get_sysvar(expr_node *node, Value *ans)
get_sysvar(expr_node const *node, Value *ans)
{
if (node->type == N_SHORT_SYSVAR) {
return GetSysVar(node->u.name, ans);
@@ -833,7 +833,7 @@ evaluate_expression(expr_node *node, Value *locals, Value *ans, int *nonconst)
return r;
}
static int CopyShortStr(Value *ans, expr_node *node)
static int CopyShortStr(Value *ans, expr_node const *node)
{
size_t len = strlen(node->u.name);
ans->v.str = malloc(len+1);

11
src/funcs.c
View File

@@ -1184,7 +1184,7 @@ static int FOrd(func_info *info)
static int FPad(func_info *info)
{
int r;
char *s;
char const *s;
DynamicBuffer dbuf;
size_t len;
size_t wantlen;
@@ -2990,7 +2990,8 @@ static int FTimeStuff(int wantmins, func_info *info)
static int FTimezone(func_info *info)
{
int yr, mon, day, hr, min, dse, now;
struct tm local, *withzone;
struct tm local;
struct tm const * withzone;
time_t t;
char buf[64];
@@ -3379,7 +3380,7 @@ static int FADusk(func_info *info)
static int FFiledate(func_info *info)
{
struct stat statbuf;
struct tm *t1;
struct tm const *t1;
RetVal.type = DATE_TYPE;
@@ -3410,7 +3411,7 @@ static int FFiledate(func_info *info)
static int FFiledatetime(func_info *info)
{
struct stat statbuf;
struct tm *t1;
struct tm const *t1;
RetVal.type = DATETIME_TYPE;
@@ -3821,7 +3822,7 @@ static int tz_convert(int year, int month, int day,
{
int r;
time_t t;
struct tm *res;
struct tm const *res;
char const *old_tz;
/* init tm struct */

5
src/init.c
View File

@@ -1017,11 +1017,6 @@ static void InitializeVar(char const *str)
return;
}
if (!*varname) {
fprintf(ErrFp, GetErr(M_I_OPTION), GetErr(E_MISS_VAR));
fprintf(ErrFp, "\n");
return;
}
expr = str+1;
if (!*expr) {
fprintf(ErrFp, GetErr(M_I_OPTION), GetErr(E_MISS_EXPR));

17
src/json.c
View File

@@ -47,19 +47,8 @@
#include <stdint.h>
#endif
#ifndef JSON_INT_T_OVERRIDDEN
#if defined(_MSC_VER)
/* https://docs.microsoft.com/en-us/cpp/cpp/data-type-ranges */
#define JSON_INT_MAX 9223372036854775807LL
#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 */
#define JSON_INT_MAX INT_FAST64_MAX
#else
/* C89 */
#include <limits.h>
#define JSON_INT_MAX LONG_MAX
#endif
#endif
#include <limits.h>
#define JSON_INT_MAX LONG_MAX
#ifndef JSON_INT_MAX
#define JSON_INT_MAX (json_int_t)(((unsigned json_int_t)(-1)) / (unsigned json_int_t)2);
@@ -252,7 +241,7 @@ static const long
flag_block_comment = 1 << 14,
flag_num_got_decimal = 1 << 15;
json_value * json_parse_ex (json_settings * settings,
json_value * json_parse_ex (json_settings const * settings,
const json_char * json,
size_t length,
char * error_buf)

2
src/json.h
View File

@@ -266,7 +266,7 @@ json_value * json_parse (const json_char * json,
size_t length);
#define json_error_max 128
json_value * json_parse_ex (json_settings * settings,
json_value * json_parse_ex (json_settings const * settings,
const json_char * json,
size_t length,
char * error);

7
src/main.c
View File

@@ -1067,7 +1067,7 @@ int PushToken(char const *tok, ParsePtr p)
int SystemTime(int realtime)
{
time_t now;
struct tm *t;
struct tm const *t;
if (!realtime && (SysTime != -1)) return SysTime;
@@ -1107,7 +1107,7 @@ int MinutesPastMidnight(int realtime)
int SystemDate(int *y, int *m, int *d)
{
time_t now;
struct tm *t;
struct tm const *t;
/* In test mode, always return 6 January 2025 */
if (TestMode) {
@@ -1571,7 +1571,8 @@ int CalcMinsFromUTC(int dse, int tim, int *mins, int *isdst)
/* Convert dse and tim to an Unix tm struct */
int yr, mon, day;
int tdiff;
struct tm local, utc, *temp;
struct tm local, utc;
struct tm const * temp;
time_t loc_t, utc_t;
int isdst_tmp;

10
src/protos.h
View File

@@ -52,9 +52,9 @@ int DoRem (ParsePtr p);
int DoFlush (ParsePtr p);
void DoExit (ParsePtr p);
int ParseRem (ParsePtr s, Trigger *trig, TimeTrig *tim);
int TriggerReminder (ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queued, DynamicBuffer *output);
int ShouldTriggerReminder (Trigger *t, TimeTrig *tim, int dse, int *err);
int DoSubst (ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse, int mode);
int TriggerReminder (ParsePtr p, Trigger *t, TimeTrig const *tim, int dse, int is_queued, DynamicBuffer *output);
int ShouldTriggerReminder (Trigger const *t, TimeTrig const *tim, int dse, int *err);
int DoSubst (ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig const *tt, int dse, int mode);
int DoSubstFromString (char const *source, DynamicBuffer *dbuf, int dse, int tim);
int ParseLiteralDateOrTime (char const **s, int *dse, int *tim);
int ParseLiteralTime (char const **s, int *tim);
@@ -124,13 +124,13 @@ int PushOmitContext (ParsePtr p);
int PopOmitContext (ParsePtr p);
int IsOmitted (int dse, int localomit, char const *omitfunc, int *omit);
int DoOmit (ParsePtr p);
int QueueReminder (ParsePtr p, Trigger *trig, TimeTrig *tim, char const *sched);
int QueueReminder (ParsePtr p, Trigger *trig, TimeTrig const *tim, char const *sched);
void HandleQueuedReminders (void);
char const *FindInitialToken (Token *tok, char const *s);
void FindToken (char const *s, Token *tok);
void FindNumericToken (char const *s, Token *t);
int ComputeTrigger (int today, Trigger *trig, TimeTrig *tim, int *err, int save_in_globals);
int ComputeTriggerNoAdjustDuration (int today, Trigger *trig, TimeTrig *tim, int *err, int save_in_globals, int duration_days);
int ComputeTriggerNoAdjustDuration (int today, Trigger *trig, TimeTrig const *tim, int *err, int save_in_globals, int duration_days);
int AdjustTriggerForDuration(int today, int r, Trigger *trig, TimeTrig *tim, int save_in_globals);
char *StrnCpy (char *dest, char const *source, int n);

4
src/queue.c
View File

@@ -97,7 +97,7 @@ char const *SimpleTimeNoSpace(int tim)
return s;
}
static void del_reminder(QueuedRem *qid)
static void del_reminder(QueuedRem const *qid)
{
QueuedRem *q = QueueHead;
QueuedRem *next;
@@ -137,7 +137,7 @@ static void del_reminder_ul(unsigned long qid) {
/* */
/***************************************************************/
int QueueReminder(ParsePtr p, Trigger *trig,
TimeTrig *tim, char const *sched)
TimeTrig const *tim, char const *sched)
{
QueuedRem *qelem;

12
src/rem2ps.c
View File

@@ -131,14 +131,14 @@ int LeftMarg, RightMarg, TopMarg, BotMarg;
int FillPage;
int Verbose = 0;
void Init (int argc, char *argv[]);
void Init (int argc, char const *argv[]);
void Usage (char const *s);
void DoPsCal (void);
int DoQueuedPs (void);
void DoSmallCal (char const *m, int days, int first, int col, int which);
void WriteProlog (void);
void WriteCalEntry (void);
void WriteOneEntry (CalEntry *c);
void WriteOneEntry (CalEntry const *c);
void GetSmallLocations (void);
char const *EatToken(char const *in, char *out, int maxlen);
@@ -178,7 +178,7 @@ int StrCmpi(char const *s1, char const *s2)
/* */
/***************************************************************/
static CalEntry *
JSONToCalEntry(DynamicBuffer *buf)
JSONToCalEntry(DynamicBuffer const *buf)
{
CalEntry *c;
json_value *val;
@@ -325,7 +325,7 @@ TextToCalEntry(DynamicBuffer *buf)
/* MAIN PROGRAM */
/* */
/***************************************************************/
int main(int argc, char *argv[])
int main(int argc, char const *argv[])
{
/* If stdin is a tty - probably wrong. */
@@ -789,7 +789,7 @@ void WriteCalEntry(void)
/* WriteOneEntry - write an entry for one day */
/* */
/***************************************************************/
void WriteOneEntry(CalEntry *c)
void WriteOneEntry(CalEntry const *c)
{
int ch, i;
char const *s = c->entry;
@@ -851,7 +851,7 @@ void WriteOneEntry(CalEntry *c)
/* Init - set up parameters */
/* */
/***************************************************************/
void Init(int argc, char *argv[])
void Init(int argc, char const *argv[])
{
char const *s;
char const *t;

2
src/token.c
View File

@@ -455,7 +455,7 @@ void
print_remind_tokens(void)
{
int i;
Token *tok;
Token const *tok;
int num = (int) (sizeof(TokArray) / sizeof(TokArray[0]));
printf("# Remind Tokens\n\n");
for (i=0; i<num; i++) {

6
src/trigger.c
View File

@@ -29,7 +29,7 @@
static int DSEYear(int dse);
static int DSEMonth(int dse);
static int NextSimpleTrig(int startdate, Trigger *trig, int *err);
static int NextSimpleTrig(int startdate, Trigger const *trig, int *err);
static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart);
/***************************************************************/
@@ -44,7 +44,7 @@ static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart
/* so that dates with a REP can be handled properly. */
/* */
/***************************************************************/
static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
static int NextSimpleTrig(int startdate, Trigger const *trig, int *err)
{
int typ = 0;
int d, m, y, j, d2, m2, y2;
@@ -529,7 +529,7 @@ int ComputeTrigger(int today, Trigger *trig, TimeTrig *tim,
/* duration. */
/* */
/***************************************************************/
int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig const *tim,
int *err, int save_in_globals, int duration_days)
{
int nattempts = 0,