Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-25 03:12:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://github.com/fluxer/kdelibs into devinfo

Browse source
This commit is contained in:
Ivailo Monev 2021-09-07 21:18:17 +03:00
commit af07d9c4bc
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kdeui/kernel/kstartupinfo.cpp
View file

@ -1085,7 +1085,7 @@ unsigned long KStartupInfoId::timestamp() const
return time;
}
// libstartup-notification style :
// qsnprintf (s, len, "%s/%s/%lu/%d-%d-%s",
// snprintf (s, len, "%s/%s/%lu/%d-%d-%s",
// canonicalized_launcher, canonicalized_launchee, (unsigned long) timestamp,
// (int) getpid (), (int) sequence_number, hostbuf);
int pos1 = d->id.lastIndexOf( '/' );

3
kio/kio/slavebase.cpp
View file

@ -724,7 +724,8 @@ static void sigsegv_handler(int sig)
// Debug and printf should be avoided because they might
// call malloc.. and get in a nice recursive malloc loop
char buffer[120];
qsnprintf(buffer, sizeof(buffer), "kioslave: ####### CRASH ###### protocol = %s pid = %d signal = %d\n", s_protocol, getpid(), sig);
memset(buffer, '\0', sizeof(buffer) * sizeof(char));
snprintf(buffer, sizeof(buffer), "kioslave: ####### CRASH ###### protocol = %s pid = %d signal = %d\n", s_protocol, getpid(), sig);
write(2, buffer, strlen(buffer));
#ifndef NDEBUG
#ifdef HAVE_BACKTRACE