Author: pfg
Date: Sat Jun 14 01:58:33 2014
New Revision: 267464
URL: http://svnweb.freebsd.org/changeset/base/267464
Log:
patch: cleanup some unnecessary cruft.
- Drop some bogus casts to size_t.
- The new_p_foo variables are not needed after r267426.
Pointed out by: bde
MFC after: 1 week
Modified:
head/usr.bin/patch/pch.c
Modified: head/usr.bin/patch/pch.c
==============================================================================
--- head/usr.bin/patch/pch.c Sat Jun 14 01:32:48 2014 (r267463)
+++ head/usr.bin/patch/pch.c Sat Jun 14 01:58:33 2014 (r267464)
@@ -132,11 +132,11 @@ void
set_hunkmax(void)
{
if (p_line == NULL)
- p_line = malloc((size_t) hunkmax * sizeof(char *));
+ p_line = malloc(hunkmax * sizeof(char *));
if (p_len == NULL)
- p_len = malloc((size_t) hunkmax * sizeof(short));
+ p_len = malloc(hunkmax * sizeof(short));
if (p_char == NULL)
- p_char = malloc((size_t) hunkmax * sizeof(char));
+ p_char = malloc(hunkmax * sizeof(char));
}
/*
@@ -145,23 +145,14 @@ set_hunkmax(void)
static void
grow_hunkmax(void)
{
- int new_hunkmax;
- char **new_p_line;
- short *new_p_len;
- char *new_p_char;
-
- new_hunkmax = hunkmax * 2;
+ int new_hunkmax = hunkmax * 2;
if (p_line == NULL || p_len == NULL || p_char == NULL)
fatal("Internal memory allocation error\n");
- new_p_line = reallocf(p_line, new_hunkmax * sizeof(char *));
- new_p_len = reallocf(p_len, new_hunkmax * sizeof(short));
- new_p_char = reallocf(p_char, new_hunkmax * sizeof(char));
-
- p_char = new_p_char;
- p_len = new_p_len;
- p_line = new_p_line;
+ p_line = reallocf(p_line, new_hunkmax * sizeof(char *));
+ p_len = reallocf(p_len, new_hunkmax * sizeof(short));
+ p_char = reallocf(p_char, new_hunkmax * sizeof(char));
if (p_line != NULL && p_len != NULL && p_char != NULL) {
hunkmax = new_hunkmax;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
