/****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey *
+ * Copyright 2020-2022,2023 Thomas E. Dickey *
* Copyright 1998-2016,2017 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
#include <dump_entry.h>
-MODULE_ID("$Id: infocmp.c,v 1.152 2022/02/26 23:25:55 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.157 2023/05/27 20:13:10 tom Exp $")
#define MAX_STRING 1024 /* maximum formatted string */
ExitProgram(EXIT_FAILURE);
}
-static char *
+static void
canonical_name(char *source, char *target)
/* extract the terminal type's primary name */
{
*target++ = ch;
}
*target = '\0';
-
- return (target);
}
static bool
}
static bool
-no_string(char *value)
+no_string(const char *const value)
{
bool result = (value == ABSENT_STRING);
if (!strcmp(s_absent, s_cancel))
sizeof(buf2));
_nc_STRNCPY(buf3, sp + csi, len);
buf3[len] = '\0';
- len += (size_t) csi + 1;
expansion = lookup_params(std_modes, buf2, buf3);
}
sizeof(buf2));
_nc_STRNCPY(buf3, sp + csi + 1, len);
buf3[len] = '\0';
- len += (size_t) csi + 2;
expansion = lookup_params(private_modes, buf2, buf3);
}
if (entryeq(&qp->tterm, &rp->tterm) && useeq(qp, rp)) {
char name1[NAMESIZE], name2[NAMESIZE];
- (void) canonical_name(qp->tterm.term_names, name1);
- (void) canonical_name(rp->tterm.term_names, name2);
+ canonical_name(qp->tterm.term_names, name1);
+ canonical_name(rp->tterm.term_names, name2);
(void) printf("%s = %s\n", name1, name2);
}
entries[0] = *qp;
entries[1] = *rp;
- (void) canonical_name(qp->tterm.term_names, name1);
- (void) canonical_name(rp->tterm.term_names, name2);
+ canonical_name(qp->tterm.term_names, name1);
+ canonical_name(rp->tterm.term_names, name2);
switch (compare) {
case C_DIFFERENCE:
case 'v':
itrace = (unsigned) optarg_to_number();
- set_trace_level(itrace);
+ use_verbosity(itrace);
break;
case 'W':