Attachment 139582 Details for Bug 185862 – file.diff

[patch] file.diff

file.diff (text/plain), 2.00 KB, created by Josh Paetzel on 2014-01-18 17:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Paetzel

Created: 2014-01-18 17:20:00 UTC

Size: 2.00 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 340194)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	netatalk
> PORTVERSION=	3.1.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> PORTEPOCH=	1
> CATEGORIES=	net
> MASTER_SITES=	SF
>Index: files/patch-etc_afpd_afp_mdns.c
>===================================================================
>--- files/patch-etc_afpd_afp_mdns.c	(revision 0)
>+++ files/patch-etc_afpd_afp_mdns.c	(working copy)
>@@ -0,0 +1,34 @@
>+--- etc/afpd/afp_mdns.c.orig	2013-10-28 06:43:13.000000000 -0700
>++++ etc/afpd/afp_mdns.c	2014-01-17 22:10:59.000000000 -0800
>+@@ -37,17 +37,15 @@
>+  * Its easier to use asprintf to set the TXT record values
>+  */
>+ #define TXTRecordPrintf(rec, key, args, ...) {           \
>+-        char *str;                                      \
>+-        asprintf(&str, args);                           \
>++        char str[1024];                                      \
>++        sprintf(str, args);                           \
>+         TXTRecordSetValue(rec, key, strlen(str), str);  \
>+-        free(str);                                      \
>+     }
>+ #define TXTRecordKeyPrintf(rec, k, var, args, ...) {     \
>+-        char *key, *str;                                \
>+-        asprintf(&key, k, var);                         \
>+-        asprintf(&str, args);                           \
>++        char key[1024], str[1024];                                \
>++        sprintf(key, k, var);                         \
>++        sprintf(str, args);                           \
>+         TXTRecordSetValue(rec, key, strlen(str), str);  \
>+-        free(str); free(key);                           \
>+     }
>+ 
>+ static struct pollfd *fds;
>+@@ -134,7 +132,7 @@
>+ 
>+     /* Register our service, prepare the TXT record */
>+     TXTRecordCreate(&txt_adisk, 0, NULL);
>+-    TXTRecordPrintf(&txt_adisk, "sys", "waMa=0,adVF=0x100");
>++    TXTRecordPrintf(&txt_adisk, "sys", "waMa=0,adVF=0x100", NULL);
>+ 
>+     /* Build AFP volumes list */
>+     int i = 0;

Actions: View | Diff

Attachments on bug 185862: 139582