[PATCH 04/13] fixes for build errors Handled git pipeline errorse

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Haritha D <harithamma.d@xxxxxxx>

This PR has fixes to enable build on z/OS

Signed-off-by: Harithamma D <harithamma.d@xxxxxxx>
---
 convert.c          | 4 ++--
 fetch-negotiator.h | 2 +-
 fetch-pack.c       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/convert.c b/convert.c
index 17cc849efed..da05f6c2e51 100644
--- a/convert.c
+++ b/convert.c
@@ -1313,13 +1313,13 @@ static int git_path_check_ident(struct attr_check_item *check)
 
 static struct attr_check *check;
 
-static const char* get_platform() {
+static const char* get_platform(void) {
 	struct utsname uname_info;
 	char *result;
 	if(!uname_info.sysname)
 	{
-		result = (char *)malloc(strlen(uname_info.sysname)+1);
 		int index=0;
+		result = (char *)malloc(strlen(uname_info.sysname)+1);
 		while(index <= strlen(uname_info.sysname))
 		{
 			*result = uname_info.sysname[index];
diff --git a/fetch-negotiator.h b/fetch-negotiator.h
index e348905a1f0..2e19ef247f9 100644
--- a/fetch-negotiator.h
+++ b/fetch-negotiator.h
@@ -47,7 +47,7 @@ struct fetch_negotiator {
 	 */
 	int (*ack)(struct fetch_negotiator *, struct commit *);
 
-	void (*release)(struct fetch_negotiator *);
+	void (*release_negotiator)(struct fetch_negotiator *);
 
 	/* internal use */
 	void *data;
diff --git a/fetch-pack.c b/fetch-pack.c
index 26999e3b659..f40b90dfa65 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1232,7 +1232,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
 
  all_done:
 	if (negotiator)
-		negotiator->release(negotiator);
+		negotiator->release_negotiator(negotiator);
 	return ref;
 }
 
-- 
gitgitgadget





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux