SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2025-01-10 01:40:29 +00:00
parent 4b49aefbb1
commit 1fd36b57f8
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
945 changed files with 81965 additions and 59988 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/xkbevd/evargs.c
View file

@ -29,7 +29,7 @@
/***====================================================================***/
static char *
AppendBellNotifyArg(char *sink, char *arg, XkbEvent *ev)
AppendBellNotifyArg(char *sink, const char *arg, const XkbEvent *ev)
{
if (uStringEqual(arg, "device") || uStringEqual(arg, "D"))
sprintf(sink, "%d", ev->bell.device);
@ -51,7 +51,7 @@ AppendBellNotifyArg(char *sink, char *arg, XkbEvent *ev)
}
static char *
AppendAccessXNotifyArg(char *sink, char *arg, XkbEvent *ev)
AppendAccessXNotifyArg(char *sink, const char *arg, const XkbEvent *ev)
{
if (uStringEqual(arg, "device") || uStringEqual(arg, "D"))
sprintf(sink, "%d", ev->accessx.device);
@ -70,7 +70,7 @@ AppendAccessXNotifyArg(char *sink, char *arg, XkbEvent *ev)
}
static char *
AppendActionMessageArg(char *sink, char *arg, XkbEvent *ev)
AppendActionMessageArg(char *sink, const char *arg, const XkbEvent *ev)
{
if (uStringEqual(arg, "device") || uStringEqual(arg, "D"))
sprintf(sink, "%d", ev->message.device);
@ -88,7 +88,7 @@ AppendActionMessageArg(char *sink, char *arg, XkbEvent *ev)
}
static char *
AppendEventArg(char *sink, char *arg, XkbEvent *ev)
AppendEventArg(char *sink, const char *arg, const XkbEvent *ev)
{
switch (ev->any.xkb_type) {
case XkbBellNotify:
@ -108,10 +108,11 @@ AppendEventArg(char *sink, char *arg, XkbEvent *ev)
}
static void
CopyEventArg(char **sink_inout, char **source_inout, XkbEvent *ev)
CopyEventArg(char **sink_inout, const char **source_inout, const XkbEvent *ev)
{
char buf[1024];
char *source, *sink;
const char *source;
char *sink;
char *arg;
arg = buf;
@ -150,13 +151,14 @@ CopyEventArg(char **sink_inout, char **source_inout, XkbEvent *ev)
return;
}
char *
SubstituteEventArgs(char *cmd, XkbEvent *ev)
const char *
SubstituteEventArgs(const char *cmd, const XkbEvent *ev)
{
static char buf[1024];
char *source, *sink;
const char *source;
char *sink;
if (index(cmd, '$') == NULL)
if (strchr(cmd, '$') == NULL)
return cmd;
buf[0] = '\0';
sink = buf;