# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/GNU-pdf/gnupdf.gaurav/
# testament_sha1: 32ca28a04530ee3d59927e3cfd0164e758665edc
# timestamp: 2009-08-26 13:48:40 +0530
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'AUTHORS'
--- AUTHORS	2009-07-23 20:18:52 +0000
+++ AUTHORS	2009-08-26 08:06:10 +0000
@@ -151,6 +151,8 @@
   torture/unit/base/stm/pdf-stm-read.c
   torture/unit/base/stm/pdf-stm-write.c
 
+Gaurav Aggarwal: changed src/base/pdf-alloc.c
+
 Gerardo E. Gidoni: wrote src/base/pdf-error.c src/base/pdf-error.h
   src/base/pdf-list.c src/base/pdf-list.h src/base/pdf-hash.c
   src/base/pdf-hash.h prmgt/patch-safety-dispatcher.py

=== modified file 'ChangeLog'
--- ChangeLog	2009-08-25 21:31:52 +0000
+++ ChangeLog	2009-08-26 08:06:10 +0000
@@ -1,3 +1,8 @@
+2009-08-26  Gaurav Aggarwal  <address@hidden>
+
+	* src/base/pdf-alloc.c: Removing redundant checks to save few CPU
+	cycles.
+
 2009-08-25  Jose E. Marchesi  <address@hidden>
 
 	* doc/gnupdf.texi: Object layer API modifications and additions.

=== modified file 'src/base/pdf-alloc.c'
--- src/base/pdf-alloc.c	2008-08-28 22:46:53 +0000
+++ src/base/pdf-alloc.c	2009-08-26 08:06:10 +0000
@@ -39,10 +39,6 @@
   void *pointer;
 
   pointer = malloc (size);
-  if (!pointer && size != 0)
-    {
-      pointer = NULL;
-    }
   return pointer;
 }
 
@@ -61,10 +57,6 @@
 pdf_realloc (const void *pointer, const pdf_size_t size)
 {
   pointer = realloc ((void *) pointer, size);
-  if (!pointer && size != 0)
-    {
-      pointer = NULL;
-    }
   return (void *) pointer;
 }
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVNmedEAApxfgCAwUXP//3rE
3gC////wUAU4vAB3Zc1NUAGEkojU00zRP01Taj0aTymRkYRpoaNMmamCVKNqP1RtJpkA0AANNANN
AAASKAqDwUynoMkwTxT1GCNG01PUYTQcwAEyYAEwmCYQwBGABJITQ1MBGho0TJNPUyNTNpNQaD1N
lFxFas1vZgZKTbWzGdzfFVzUgao+Hiy5KzvqluPKxTUpVluuZTXc65AwLhjabbNniGHnOrLbI0e/
Nl25Eo6OHNSJyeq9vGPUXF+aYbcfvmgoP1e0a2s5ymiEDiTTHf590Kn2TxxxW1RgIIM6CCfshQHb
fIslPHdGzOxcazPUPFoESpNhpU/s8NhgI9a1W8rRmAqBYBjAbyu7LE9iDlXflSkqoCHfGZ94C0tu
IJyJidh58idwh4QCekoPtBOENASi57JLI4BT6nPo48NwipXhQyZq9EFYqxFT9OFkSJdnjEPQLwtK
X3BcPaA5hx9ay75RakHlZgZXlgtAztTBpA8WSVz0SYJBOb2ID9pBZQNJGjbQGGVTxELZyBkTWTER
YlptKVWXfkRKRa10TWIqCmuOBQXTEQeZUGU/sIyNIVjiQxpPc0WqywHFxeSLzMiSOwjRBxXE4osK
zYGoZEPqVllUqFk00028sqNZtlvkXzhqRMEnlbQNg6I48yBGyBQVjiaUI0DaaGJEwhpxEIRK39Nh
7ytrNpsMSBBGgeQHRYweEH3lAg/PHRG11BBtQxQsGhiyulCbOariugmNInIoEIpJ2FN4oyQypLKF
lJn3vLBtFgwA68gXlJuIlZhVUUkS4kREOIYUlDGFNCGBkPsDAU3U7+0Zha2PNjRy1A6ccdH4j2c8
6ZFw6NYfO2NIE3CPWLlBQvVxNtNj2xJRhCFVffuOD7FX5UcLwKzK0iZJpJKyeylMJWA+BHkYizmG
xnK2TaaIqTrHCcC9Vr1GYa0F7oeHiO1iuAalinr2TwXfjJJYLrI8TM+g48SB5GJwMC8rsNBxLBtE
V/b50iGWJDxxGUl0ixjy4bLph6hUej3QEsLD4KwFN2/hztpEYDXkXn3NQxsPQ9BjUjgUodEvScUk
TDuQRztLgqOC5ucnFsjLk8weFhMZeFh9Vi0hoJdRqZHBMVxqvGaJYF5okR3yZrF3kuFMlxwu2bwv
XA1KgRqnSfZy0JsDiMcSByIlIc6g1WbF8lNfFrttOfFMz4xkRW5l/gXwKsTXeus0h7i9u0DiB+zl
cxIFrNhbrE/PAuvSgZhOgcbfEFIUu0983xwETCN3iPXbnifRl3iPmG08BGHI1iqETHxEbz7lqMsI
d/RBQni66kd52uzEPFyUQ68JEDfv/MTNDKekpzCVDJDbQ6OT2R6nYE8BYEzk8N1oLyeVBMyWgTl3
cSkFsBUCNaMf+cbpqRH26gp0SF8hVKBwgq7yc9BDsTdu3IdvYaYKAq0ZRoGv8i0nOZu3L5gqhd1S
SiRFN0DA6QAt8IK5k/lUKuhy5mT9QOIEwzGhOXcbiATDNcVH4oW5GgOIhlOiwnKVFKfSfDm8f6ir
aVIo7dpheTHmxSKQdBiZkYOMXi8M2J7gR1YFkMoqsxEfrS6oqUx0Cw8QilNi3NzvMF3LsEW1BRIH
MXckU4UJBTZnnRA=