Attachment 160113 Details for Bug 202495 – Fix devel/libpru printf format errors with clang 3.7.0

[patch] Fix devel/libpru printf format errors with clang 3.7.0

devel__libpru-fix-format-errors.diff (text/plain), 3.56 KB, created by Dimitry Andric on 2015-08-19 20:03:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2015-08-19 20:03:57 UTC

Size: 3.56 KB

patch

obsolete

>Index: devel/libpru/files/patch-pru.c
>===================================================================
>--- devel/libpru/files/patch-pru.c	(revision 0)
>+++ devel/libpru/files/patch-pru.c	(working copy)
>@@ -0,0 +1,38 @@
>+--- pru.c.orig	2015-02-23 21:35:34.000000000 +0100
>++++ pru.c	2015-08-19 21:57:20.703559000 +0200
>+@@ -109,7 +109,7 @@ pru_alloc(pru_type_t type)
>+ 		errno = EINVAL; /* XXX */
>+ 		return NULL;
>+ 	}
>+-	DPRINTF("pru %p allocated and initialised\n", pru);
>++	DPRINTF("pru %p allocated and initialised\n", (void *)pru);
>+ 
>+ 	return pru;
>+ }
>+@@ -117,7 +117,7 @@ pru_alloc(pru_type_t type)
>+ void
>+ pru_free(pru_t pru)
>+ {
>+-	DPRINTF("pru %p\n", pru);
>++	DPRINTF("pru %p\n", (void *)pru);
>+ 	pru->deinit(pru);
>+ #ifdef __BLOCKS__
>+ 	if (pru->intr_block)
>+@@ -138,7 +138,7 @@ pru_set_handler(pru_t pru, void (^block)
>+ void
>+ pru_set_handler_f(pru_t pru, void (*f)(int))
>+ {
>+-	DPRINTF("function %p\n", f);
>++	DPRINTF("function %p\n", (void *)f);
>+ 	pru->intr_func = f;
>+ }
>+ 
>+@@ -195,7 +195,7 @@ int
>+ pru_upload_buffer(pru_t pru, unsigned int pru_number, const char *buffer,
>+     size_t len)
>+ {
>+-	DPRINTF("pru %d buffer %p len %zu\n", pru_number, buffer, len);
>++	DPRINTF("pru %d buffer %p len %zu\n", pru_number, (const void *)buffer, len);
>+ 	return pru->upload_buffer(pru, pru_number, buffer, len);
>+ }
>+ 
>
>Property changes on: devel/libpru/files/patch-pru.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libpru/files/patch-ti-pru.c
>===================================================================
>--- devel/libpru/files/patch-ti-pru.c	(revision 0)
>+++ devel/libpru/files/patch-ti-pru.c	(working copy)
>@@ -0,0 +1,37 @@
>+--- ti-pru.c.orig	2015-02-23 21:35:34.000000000 +0100
>++++ ti-pru.c	2015-08-19 21:58:51.690153000 +0200
>+@@ -141,7 +141,7 @@ ti_upload(pru_t pru, unsigned int pru_nu
>+ 			return -1;
>+ 		}
>+ 		iram += AM18XX_PRUnIRAM(pru_number);
>+-		DPRINTF("IRAM at %p\n", iram);
>++		DPRINTF("IRAM at %p\n", (void*)iram);
>+ 		memset(iram, 0, AM18XX_IRAM_SIZE);
>+ 	} else {
>+ 		if (size > AM33XX_IRAM_SIZE) {
>+@@ -149,10 +149,10 @@ ti_upload(pru_t pru, unsigned int pru_nu
>+ 			return -1;
>+ 		}
>+ 		iram += AM33XX_PRUnIRAM(pru_number);
>+-		DPRINTF("IRAM at %p\n", iram);
>++		DPRINTF("IRAM at %p\n", (void*)iram);
>+ 		memset(iram, 0, AM33XX_IRAM_SIZE);
>+ 	}
>+-	DPRINTF("copying buf %p size %zu\n", buffer, size);
>++	DPRINTF("copying buf %p size %zu\n", (const void *)buffer, size);
>+ 	memcpy(iram, buffer, size);
>+ 
>+ 	return 0;
>+@@ -627,10 +627,10 @@ ti_initialise(pru_t pru)
>+ 	 * Use the md_stor field to save the revision.
>+ 	 */
>+ 	if (ti_reg_read_4(pru->mem, AM18XX_INTC_REG) == AM18XX_REV) {
>+-		DPRINTF("found AM18XX PRU @ %p\n", pru->mem);
>++		DPRINTF("found AM18XX PRU @ %p\n", (void *)pru->mem);
>+ 		pru->md_stor[0] = AM18XX_REV;
>+ 	} else if (ti_reg_read_4(pru->mem, AM33XX_INTC_REG) == AM33XX_REV) {
>+-		DPRINTF("found AM33XX PRU @ %p\n", pru->mem);
>++		DPRINTF("found AM33XX PRU @ %p\n", (void *)pru->mem);
>+ 		pru->md_stor[0] = AM33XX_REV;
>+ 	} else {
>+ 		munmap(pru->mem, pru->mem_size);
>
>Property changes on: devel/libpru/files/patch-ti-pru.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 202495: 160113