package version up to 1.7.1

[platform/core/uifw/libtdm.git] / src / tdm_helper.c

diff --git a/src/tdm_helper.c b/src/tdm_helper.c
index 90dd618..712a9da 100644 (file)
--- a/src/tdm_helper.c
+++ b/src/tdm_helper.c
@@ -44,6 +44,7 @@
 #include <string.h>
 #include <time.h>
 #include <pixman.h>
+#include <inttypes.h>
 
 #include "tdm.h"
 #include "tdm_private.h"
@@ -547,7 +548,7 @@ tdm_helper_get_fd(const char *env)
        if (!value)
                return -1;
 
-       const long sl = strtol(value, &end, 10);
+       const long int sl = strtol(value, &end, 10);
        if (end == value) {
                TDM_ERR("%s: not a decimal number\n", value);
                return -1;
@@ -557,10 +558,10 @@ tdm_helper_get_fd(const char *env)
        } else if ((sl == LONG_MIN || sl == LONG_MAX) && errno == ERANGE) {
                TDM_ERR("%s out of range of type long\n", value);
                return -1;
-       } else if (sl > INT_MAX) {
+       } else if (sl >= INT_MAX) {
                TDM_ERR("%ld greater than INT_MAX\n", sl);
                return -1;
-       } else if (sl < INT_MIN) {
+       } else if (sl <= INT_MIN) {
                TDM_ERR("%ld less than INT_MIN\n", sl);
                return -1;
        } else {
@@ -854,7 +855,7 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
 
                TDM_SNPRINTF(reply, len, "\t%d properties:\n", private_output->caps.prop_count);
                if (private_output->caps.prop_count > 0) {
-                       TDM_SNPRINTF(reply, len, "\t\tname\tidx\tvalue\n");
+                       TDM_SNPRINTF(reply, len, "\t\tname\ttype\tidx\tvalue\n");
                        for (i = 0; i < private_output->caps.prop_count; i++) {
                                tdm_value value;
                                TDM_DBG_GOTO_IF_FAIL(func_output->output_get_property, unlock);
@@ -862,10 +863,28 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
                                                                                                           private_output->caps.props[i].id,
                                                                                                           &value);
                                TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
-                               TDM_SNPRINTF(reply, len, "\t\t%s\t%u\t%u\n",
+                               TDM_SNPRINTF(reply, len, "\t\t%s\t%s\t%u\t",
                                                         private_output->caps.props[i].name,
-                                                        private_output->caps.props[i].id,
-                                                        value.u32);
+                                                        tdm_value_type_str(private_output->caps.props[i].type),
+                                                        private_output->caps.props[i].id);
+                               switch (private_output->caps.props[i].type) {
+                               case TDM_VALUE_TYPE_PTR:
+                                       TDM_SNPRINTF(reply, len, "%p\n", value.ptr);
+                                       break;
+                               case TDM_VALUE_TYPE_INT32:
+                                       TDM_SNPRINTF(reply, len, "%d\n", value.s32);
+                                       break;
+                               case TDM_VALUE_TYPE_INT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRId64"\n", value.s64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRIu64"\n", value.u64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT32:
+                               default:
+                                       TDM_SNPRINTF(reply, len, "%u\n", value.u32);
+                                       break;
+                               }
                        }
                }
        }
@@ -937,7 +956,7 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
 
                        TDM_SNPRINTF(reply, len, "\t%u properties:\n", private_layer->caps.prop_count);
                        if (private_layer->caps.prop_count > 0) {
-                               TDM_SNPRINTF(reply, len, "\t\tname\tidx\tvalue\n");
+                               TDM_SNPRINTF(reply, len, "\t\tname\ttype\tidx\tvalue\n");
                                for (i = 0; i < private_layer->caps.prop_count; i++) {
                                        tdm_value value;
                                        TDM_DBG_GOTO_IF_FAIL(func_layer->layer_get_property, unlock);
@@ -945,10 +964,28 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
                                                                                                                 private_layer->caps.props[i].id,
                                                                                                                 &value);
                                        TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
-                                       TDM_SNPRINTF(reply, len, "\t\t%s\t%u\t%u\n",
+                                       TDM_SNPRINTF(reply, len, "\t\t%s\t%s\t%u\t",
                                                                 private_layer->caps.props[i].name,
-                                                                private_layer->caps.props[i].id,
-                                                                value.u32);
+                                                                tdm_value_type_str(private_output->caps.props[i].type),
+                                                                private_layer->caps.props[i].id);
+                               switch (private_layer->caps.props[i].type) {
+                               case TDM_VALUE_TYPE_PTR:
+                                       TDM_SNPRINTF(reply, len, "%p\n", value.ptr);
+                                       break;
+                               case TDM_VALUE_TYPE_INT32:
+                                       TDM_SNPRINTF(reply, len, "%d\n", value.s32);
+                                       break;
+                               case TDM_VALUE_TYPE_INT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRId64"\n", value.s64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT64:
+                                       TDM_SNPRINTF(reply, len, "%"PRIu64"\n", value.u64);
+                                       break;
+                               case TDM_VALUE_TYPE_UINT32:
+                               default:
+                                       TDM_SNPRINTF(reply, len, "%u\n", value.u32);
+                                       break;
+                               }
                                }
                        }
                }