shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

fix last checkin

Browse Source
This commit is contained in:
Alasdair Kergon 2007-01-08 15:35:08 +00:00
parent 5b95f17814
commit 616c3eccfd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemons/dmeventd/dmeventd.c
View File

@ -40,6 +40,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/resource.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
#include <arpa/inet.h> /* for htonl, ntohl */ #include <arpa/inet.h> /* for htonl, ntohl */
@ -1453,7 +1455,7 @@ int main(int argc, char *argv[])
init_fifos(&fifos); init_fifos(&fifos);
pthread_mutex_init(&mutex, NULL); pthread_mutex_init(&_global_mutex, NULL);
#ifdef MCL_CURRENT #ifdef MCL_CURRENT
if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1) if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1)
@ -1481,7 +1483,7 @@ int main(int argc, char *argv[])
#ifdef MCL_CURRENT #ifdef MCL_CURRENT
munlockall(); munlockall();
#endif #endif
pthread_mutex_destroy(&_mutex); pthread_mutex_destroy(&_global_mutex);
syslog(LOG_INFO, "dmeventd shutting down."); syslog(LOG_INFO, "dmeventd shutting down.");
closelog(); closelog();

2
libdm/libdm-string.c
View File

@ -126,6 +126,6 @@ char *dm_basename(const char *path)
{ {
char *p = strrchr(path, '/'); char *p = strrchr(path, '/');
return p ? p + 1 : path; return p ? p + 1 : (char *) path;
} }