X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fslide.c;h=2b8f1572bf8a5b0fefd19e66a78b3a866d8fec6b;hb=25d900de136f12439738b6773571736eae86e00f;hp=06c77689cb30f3d145fabae2c98ebfbf71281a88;hpb=d20265fbf33e22b30b5c2879cff7ae5c22d3fc29;p=sympathy.git

diff --git a/src/slide.c b/src/slide.c
index 06c7768..2b8f157 100644
--- a/src/slide.c
+++ b/src/slide.c
@@ -1,15 +1,30 @@
-/*
+/* 
  * slide.c:
  *
- * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
+ * Copyright (c) 2008 James McKenzie <sympathy@madingley.org>,
  * All rights reserved.
  *
  */
 
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$Id: slide.c,v 1.8 2008/03/07 14:13:40 james Exp $";
 
-/*
- * $Log$
+/* 
+ * $Log: slide.c,v $
+ * Revision 1.8  2008/03/07 14:13:40  james
+ * *** empty log message ***
+ *
+ * Revision 1.7  2008/03/07 13:16:02  james
+ * *** empty log message ***
+ *
+ * Revision 1.6  2008/03/07 12:37:04  james
+ * *** empty log message ***
+ *
+ * Revision 1.5  2008/03/03 06:04:42  james
+ * *** empty log message ***
+ *
+ * Revision 1.4  2008/03/02 10:37:56  james
+ * *** empty log message ***
+ *
  * Revision 1.3  2008/02/14 02:46:44  james
  * *** empty log message ***
  *
@@ -45,15 +60,14 @@ slide_consume (Slide * s, int n)
   s->nbytes -= n;
 
   if (s->nbytes < 0)
-    abort ();
+    crash_out ("slide_consume called with -ve number of bytes");
 
   memmove (s->slide, s->slide + n, s->nbytes);
 
-  if ((s->size > s->target_size) && (s->nbytes <= s->target_size))
-    {
-      s->size = s->target_size;
-      s->slide = realloc (s->slide, s->size);
-    }
+  if ((s->size > s->target_size) && (s->nbytes <= s->target_size)) {
+    s->size = s->target_size;
+    s->slide = realloc (s->slide, s->size);
+  }
 
 }
 
@@ -66,9 +80,9 @@ slide_added (Slide * s, int n)
 Slide *
 slide_new (int n)
 {
-  Slide *ret = (Slide *) malloc (sizeof (Slide));
+  Slide *ret = (Slide *) xmalloc (sizeof (Slide));
 
-  ret->slide = (uint8_t *) malloc (n);
+  ret->slide = (uint8_t *) xmalloc (n);
   ret->size = n;
   ret->target_size = n;
   ret->nbytes = 0;
@@ -88,7 +102,6 @@ slide_expand (Slide * s, int n)
   while (n > s->size)
     s->size <<= 1;
 
-//FIXME -- might fail
-  s->slide = realloc (s->slide, s->size);
+  s->slide = xrealloc (s->slide, s->size);
 
 }