From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 30 Mar 2001 06:10:52 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_2_3~197
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8bca0bd407ea317948490da37ff142742c854cfb;p=platform%2Fupstream%2Fglibc.git

Update.

	* posix/regex.c: Remove unnecessary ifs.
---

diff --git a/ChangeLog b/ChangeLog
index cc4eed6..4a173b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2001-03-29  Ulrich Drepper  <drepper@redhat.com>
 
+	* posix/regex.c: Remove unnecessary ifs.
+
 	* math/bits/mathcalls.h: Remove infnan declaration.
 
 2001-03-29  H.J. Lu  <hjl@gnu.org>
diff --git a/posix/regex.c b/posix/regex.c
index 3de24ca..e3aafbc 100644
--- a/posix/regex.c
+++ b/posix/regex.c
@@ -2339,23 +2339,23 @@ regex_compile (pattern, size, syntax, bufp)
 #ifdef MBS_SUPPORT
   /* Initialize the wchar_t PATTERN and offset_buffer.  */
   p = pend = pattern = TALLOC(csize + 1, CHAR_TYPE);
-  p[csize] = L'\0';	/* sentinel */
+  pattern[csize] = L'\0';	/* sentinel */
   mbs_offset = TALLOC(csize + 1, int);
   is_binary = TALLOC(csize + 1, char);
   if (pattern == NULL || mbs_offset == NULL || is_binary == NULL)
     {
-      if (pattern) free(pattern);
-      if (mbs_offset) free(mbs_offset);
-      if (is_binary) free(is_binary);
+      free(pattern);
+      free(mbs_offset);
+      free(is_binary);
       return REG_ESPACE;
     }
   size = convert_mbs_to_wcs(pattern, cpattern, csize, mbs_offset, is_binary);
   pend = p + size;
   if (size < 0)
     {
-      if (pattern) free(pattern);
-      if (mbs_offset) free(mbs_offset);
-      if (is_binary) free(is_binary);
+      free(pattern);
+      free(mbs_offset);
+      free(is_binary);
       return REG_BADPAT;
     }
 #endif
@@ -2377,9 +2377,9 @@ regex_compile (pattern, size, syntax, bufp)
   if (compile_stack.stack == NULL)
     {
 #ifdef MBS_SUPPORT
-      if (pattern) free(pattern);
-      if (mbs_offset) free(mbs_offset);
-      if (is_binary) free(is_binary);
+      free(pattern);
+      free(mbs_offset);
+      free(is_binary);
 #endif
       return REG_ESPACE;
     }