cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-29 23:18:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

atftp: fix compilation with glibc

Browse Source 
It's defining two functions twice for some reason.

Refreshed patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2020-12-30 15:11:09 -08:00
parent d39c77ba81
commit 9ac737ac80
5 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/atftp/patches/03-Fix-undefined-reference-linker-errors.patch
+4 -15
View File
@@ -1,8 +1,6 @@
diff --git a/tftp_def.c b/tftp_def.c
index 96abdc5..16240f7 100644
--- a/tftp_def.c
+++ b/tftp_def.c
@@ -141,7 +141,7 @@ int print_eng(double value, char *string, int size, char *format)
@@ -133,7 +133,7 @@ int print_eng(double value, char *string
/*
* This is a strncpy function that take care of string NULL termination
*/
@@ -11,11 +9,9 @@ index 96abdc5..16240f7 100644
{
strncpy(to, from, size);
if (size>0)
diff --git a/tftp_def.h b/tftp_def.h
index e4b338d..4418ee7 100644
--- a/tftp_def.h
+++ b/tftp_def.h
@@ -50,7 +50,7 @@ extern char *tftp_errmsg[9];
@@ -51,7 +51,7 @@ extern char *tftp_errmsg[9];
int timeval_diff(struct timeval *res, struct timeval *t1, struct timeval *t0);
int print_eng(double value, char *string, int size, char *format);
@@ -24,11 +20,9 @@ index e4b338d..4418ee7 100644
int Gethostbyname(char *addr, struct hostent *host);
char *sockaddr_print_addr(const struct sockaddr_storage *, char *, size_t);
diff --git a/tftpd.h b/tftpd.h
index 945065e..4bd3f17 100644
--- a/tftpd.h
+++ b/tftpd.h
@@ -93,7 +93,7 @@ int tftpd_list_find_multicast_server_and_add(struct thread_data **thread,
@@ -93,7 +93,7 @@ int tftpd_list_find_multicast_server_and
/*
* Defined in tftpd_list.c, operation on client structure list.
*/
@@ -37,11 +31,9 @@ index 945065e..4bd3f17 100644
void tftpd_clientlist_remove(struct thread_data *thread,
struct client_info *client);
void tftpd_clientlist_free(struct thread_data *thread);
diff --git a/tftpd_list.c b/tftpd_list.c
index f376159..159ffca 100644
--- a/tftpd_list.c
+++ b/tftpd_list.c
@@ -201,7 +201,7 @@ int tftpd_list_find_multicast_server_and_add(struct thread_data **thread,
@@ -201,7 +201,7 @@ int tftpd_list_find_multicast_server_and
return 0;
}
@@ -50,6 +42,3 @@ index f376159..159ffca 100644
{
pthread_mutex_lock(&thread->client_mutex);
thread->client_ready = 1;
--
2.1.4