1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00

games/openbor: oops, make sure patch(1) doesn't confuse context

This commit is contained in:
Jan Beich 2017-05-10 02:32:29 +00:00
parent 8e040e9d10
commit fdf3fa67c3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=440523
3 changed files with 47 additions and 4 deletions

View File

@ -3,6 +3,9 @@
PORTNAME= openbor PORTNAME= openbor
# Hint: svn revision is git rev-list --count ${GH_TAGNAME} # Hint: svn revision is git rev-list --count ${GH_TAGNAME}
PORTVERSION?= 4505 PORTVERSION?= 4505
.ifndef PKGNAMESUFFIX
PORTREVISION= 1
.endif
CATEGORIES= games CATEGORIES= games
MAINTAINER= jbeich@FreeBSD.org MAINTAINER= jbeich@FreeBSD.org

View File

@ -4,7 +4,12 @@ Avoid accidental rounding from abs()
--- openbor.c.orig 2017-04-22 14:20:08 UTC --- openbor.c.orig 2017-04-22 14:20:08 UTC
+++ openbor.c +++ openbor.c
@@ -5810,7 +5810,7 @@ s_collision_attack **collision_alloc_att @@ -5747,17 +5747,17 @@ s_collision_attack *collision_alloc_attack_instance(s_
//
// Allocate an empty collision attack list.
s_collision_attack **collision_alloc_attack_list()
{
s_collision_attack **result;
size_t alloc_size; size_t alloc_size;
// Get amount of memory we'll need. // Get amount of memory we'll need.
@ -13,7 +18,17 @@ Avoid accidental rounding from abs()
// Allocate memory and get pointer. // Allocate memory and get pointer.
result = malloc(alloc_size); result = malloc(alloc_size);
@@ -5859,7 +5859,7 @@ s_collision_body **collision_alloc_body_
// Make sure the list is blank.
memset(result, 0, alloc_size);
// return result.
@@ -5796,17 +5796,17 @@ s_collision_body *collision_alloc_body_instance(s_coll
//
// Allocate an empty collision attack list.
s_collision_body **collision_alloc_body_list()
{
s_collision_body **result;
size_t alloc_size; size_t alloc_size;
// Get amount of memory we'll need. // Get amount of memory we'll need.
@ -22,6 +37,11 @@ Avoid accidental rounding from abs()
// Allocate memory and get pointer. // Allocate memory and get pointer.
result = malloc(alloc_size); result = malloc(alloc_size);
// Make sure the list is blank.
memset(result, 0, alloc_size);
// return result.
@@ -8204,7 +8204,8 @@ size_t lcmScriptCopyBuffer(ArgList *argl @@ -8204,7 +8204,8 @@ size_t lcmScriptCopyBuffer(ArgList *argl
size_t lcmScriptDeleteMain(char **buf) size_t lcmScriptDeleteMain(char **buf)

View File

@ -4,7 +4,12 @@ Avoid accidental rounding from abs()
--- openbor.c.orig 2016-12-22 13:02:02 UTC --- openbor.c.orig 2016-12-22 13:02:02 UTC
+++ openbor.c +++ openbor.c
@@ -5810,7 +5810,7 @@ s_collision_attack **collision_alloc_att @@ -5821,17 +5821,17 @@ s_collision_attack *collision_alloc_attack_instance(s_
//
// Allocate an empty collision attack list.
s_collision_attack **collision_alloc_attack_list()
{
s_collision_attack **result;
size_t alloc_size; size_t alloc_size;
// Get amount of memory we'll need. // Get amount of memory we'll need.
@ -13,7 +18,17 @@ Avoid accidental rounding from abs()
// Allocate memory and get pointer. // Allocate memory and get pointer.
result = malloc(alloc_size); result = malloc(alloc_size);
@@ -5859,7 +5859,7 @@ s_collision_body **collision_alloc_body_
// Make sure the list is blank.
memset(result, 0, alloc_size);
// return result.
@@ -5870,17 +5870,17 @@ s_collision_body *collision_alloc_body_instance(s_coll
//
// Allocate an empty collision attack list.
s_collision_body **collision_alloc_body_list()
{
s_collision_body **result;
size_t alloc_size; size_t alloc_size;
// Get amount of memory we'll need. // Get amount of memory we'll need.
@ -22,6 +37,11 @@ Avoid accidental rounding from abs()
// Allocate memory and get pointer. // Allocate memory and get pointer.
result = malloc(alloc_size); result = malloc(alloc_size);
// Make sure the list is blank.
memset(result, 0, alloc_size);
// return result.
@@ -8204,7 +8204,8 @@ size_t lcmScriptCopyBuffer(ArgList *argl @@ -8204,7 +8204,8 @@ size_t lcmScriptCopyBuffer(ArgList *argl
size_t lcmScriptDeleteMain(char **buf) size_t lcmScriptDeleteMain(char **buf)