[clinfo] 18/55: CL_DEVICE_PRINTF_BUFFER_SIZE is a size_t

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch master
in repository clinfo.

commit 8eb0d8811ab501c39fc7ec20a2783d922c5c5ad9
Author: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
Date:   Thu Feb 9 16:07:14 2017 +0100

    CL_DEVICE_PRINTF_BUFFER_SIZE is a size_t
    
    So device a new printer or size_t-sized memory values. This fixes Debian
    Bug #848182.
---
 src/clinfo.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/clinfo.c b/src/clinfo.c
index 119f34d..796b9b5 100644
--- a/src/clinfo.c
+++ b/src/clinfo.c
@@ -864,6 +864,21 @@ int device_info_mem_int(cl_device_id dev, cl_device_info param, const char *pnam
 	return had_error;
 }
 
+int device_info_mem_sz(cl_device_id dev, cl_device_info param, const char *pname,
+	const struct device_info_checks *chk UNUSED)
+{
+	size_t val = 0;
+	size_t szval = 0;
+	GET_VAL;
+	if (!had_error) {
+		szval += sprintf(strbuf, "%zu", val);
+		if (output_mode == CLINFO_HUMAN && val > 1024)
+			strbuf_mem(val, szval);
+	}
+	show_strbuf(pname, 0);
+	return had_error;
+}
+
 int device_info_free_mem_amd(cl_device_id dev, cl_device_info param, const char *pname,
 	const struct device_info_checks *chk UNUSED)
 {
@@ -1840,7 +1855,7 @@ struct device_info_traits dinfo_traits[] = {
 	 */
 	{ CLINFO_BOTH, DINFO(CL_DEVICE_IL_VERSION, INDENT "IL version", str), dev_is_21, },
 	{ CLINFO_BOTH, DINFO(CL_DEVICE_SPIR_VERSIONS, INDENT "SPIR versions", str), dev_has_spir },
-	{ CLINFO_BOTH, DINFO(CL_DEVICE_PRINTF_BUFFER_SIZE, "printf() buffer size", mem), dev_is_12 },
+	{ CLINFO_BOTH, DINFO(CL_DEVICE_PRINTF_BUFFER_SIZE, "printf() buffer size", mem_sz), dev_is_12 },
 	{ CLINFO_BOTH, DINFO(CL_DEVICE_BUILT_IN_KERNELS, "Built-in kernels", str), dev_is_12 },
 	{ CLINFO_BOTH, DINFO(CL_DEVICE_ME_VERSION_INTEL, "Motion Estimation accelerator version (Intel)", int), dev_has_intel_AME },
 	{ CLINFO_BOTH, DINFO(CL_DEVICE_AVC_ME_VERSION_INTEL, INDENT "Device-side AVC Motion Estimation version", int), dev_has_intel_AVC_ME },

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/clinfo.git