[clinfo] 24/30: Tune handing of platforms with no devices

[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 015e77ad996107cb29e0e8ae33fabcb0aad9e790
Author: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
Date:   Fri Apr 3 09:06:41 2015 +0200

    Tune handing of platforms with no devices
---
 src/clinfo.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/clinfo.c b/src/clinfo.c
index 935b463..f1a718b 100644
--- a/src/clinfo.c
+++ b/src/clinfo.c
@@ -378,7 +378,9 @@ printPlatformInfo(cl_uint p)
 		platform_sname_maxlen = len;
 
 	error = clGetDeviceIDs(pid, CL_DEVICE_TYPE_ALL, 0, NULL, &(pdata[p].ndevs));
-	if (error != CL_DEVICE_NOT_FOUND)
+	if (error == CL_DEVICE_NOT_FOUND)
+		pdata[p].ndevs = 0;
+	else
 		CHECK_ERROR("number of devices");
 
 	num_devs_all += pdata[p].ndevs;
@@ -1965,22 +1967,22 @@ void listPlatformsAndDevices(cl_bool show_offline)
 		if (pdata[p].ndevs > 0) {
 			error = clGetDeviceIDs(platform[p], CL_DEVICE_TYPE_ALL, pdata[p].ndevs, device, NULL);
 			CHECK_ERROR("device IDs");
+			for (d = 0; d < pdata[p].ndevs; ++d) {
+				/*
+				if (output_mode == CLINFO_HUMAN)
+					puts(" |");
+				*/
+				cl_bool last_device = (d == pdata[p].ndevs - 1 && output_mode != CLINFO_RAW &&
+					(!show_offline || !pdata[p].has_amd_offline));
+				if (last_device)
+					line_pfx[1] = '`';
+				had_error = device_info_str_get(device[d], CL_DEVICE_NAME, "CL_DEVICE_NAME", NULL);
+				printf("%s%u: %s\n", line_pfx, d, strbuf);
+				fflush(stdout);
+				fflush(stderr);
+			}
 		}
 
-		for (d = 0; d < pdata[p].ndevs; ++d) {
-			/*
-			if (output_mode == CLINFO_HUMAN)
-				puts(" |");
-			*/
-			cl_bool last_device = (d == pdata[p].ndevs - 1 && output_mode != CLINFO_RAW &&
-				(!show_offline || !pdata[p].has_amd_offline));
-			if (last_device)
-				line_pfx[1] = '`';
-			had_error = device_info_str_get(device[d], CL_DEVICE_NAME, "CL_DEVICE_NAME", NULL);
-			printf("%s%u: %s\n", line_pfx, d, strbuf);
-			fflush(stdout);
-			fflush(stderr);
-		}
 		if (show_offline && pdata[p].has_amd_offline) {
 			if (output_mode == CLINFO_RAW)
 				sprintf(line_pfx, "%u*", p);

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