From be42afab1c325fae5c3c270876a3447220adcca5 Mon Sep 17 00:00:00 2001
From: james <>
Date: Fri, 7 Mar 2008 13:16:02 +0000
Subject: *** empty log message ***

---
 src/lockfile.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/lockfile.c')

diff --git a/src/lockfile.c b/src/lockfile.c
index 31343cc..72e7960 100644
--- a/src/lockfile.c
+++ b/src/lockfile.c
@@ -11,6 +11,9 @@ static char rcsid[] =
 
 /* 
  * $Log$
+ * Revision 1.14  2008/03/07 13:16:02  james
+ * *** empty log message ***
+ *
  * Revision 1.13  2008/03/07 12:37:04  james
  * *** empty log message ***
  *
@@ -74,10 +77,12 @@ static char rcsid[] =
 
 #include "lockfile.h"
 
+extern void *xmalloc(size_t);
+
 Filelist *
 filelist_new (void)
 {
-  Filelist *fl = (Filelist *) malloc (sizeof (Filelist));
+  Filelist *fl = (Filelist *) xmalloc (sizeof (Filelist));
 
   fl->head = NULL;
 
@@ -115,7 +120,7 @@ filelist_add (Filelist * fl, char *fn)
     if (!strcmp (fle->name, fn))
       return;
 
-  fle = malloc (sizeof (Filelist_ent));
+  fle = xmalloc (sizeof (Filelist_ent));
 
   strcpy (fle->name, fn);
 
@@ -342,6 +347,7 @@ lockfile_make_list (char *device)
 
   ret = filelist_new ();
 
+  if (ret) {
   lockfile_add_name_from_dev (ret, dev_stat.st_rdev);
 
   lockfile_add_name_from_path (ret, device);
@@ -349,6 +355,7 @@ lockfile_make_list (char *device)
   lockfile_check_dir_for_dev (ret, "/dev/", dev_stat.st_rdev);
   lockfile_check_dir_for_dev (ret, "/dev/usb/", dev_stat.st_rdev);
   lockfile_check_dir_for_dev (ret, "/dev/tts/", dev_stat.st_rdev);
+  }
 
   return ret;
 }
@@ -420,6 +427,7 @@ lockfile_lock (Filelist * fl)
 
   ret = filelist_new ();
 
+  if (ret) {
   lockfile_remove_stale (fl);
 
   for (fle = fl->head; fle; fle = fle->next) {
@@ -430,6 +438,7 @@ lockfile_lock (Filelist * fl)
     }
     filelist_add (ret, fle->name);
   }
+ }
 
   return ret;
 }
@@ -505,7 +514,7 @@ serial_lock_new (char *dev, int mode)
   if (!fl)
     return NULL;
 
-  l = (Serial_lock *) malloc (sizeof (Serial_lock));
+  l = (Serial_lock *) xmalloc (sizeof (Serial_lock));
 
   l->mode = mode;
   l->locks_to_check = fl;
-- 
cgit v1.2.3