aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcoopgamma.h
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2016-07-15 23:06:28 +0200
committerMattias Andrée <maandree@kth.se>2016-07-15 23:06:28 +0200
commit75bf6ecd2173d7e6b37b9709502997fbf75b2a90 (patch)
tree252379a4c22e12bf6fe4a6de3595ecfa7bd33fe7 /src/libcoopgamma.h
parentImplement libcoopgamma_connect (diff)
downloadlibcoopgamma-75bf6ecd2173d7e6b37b9709502997fbf75b2a90.tar.gz
libcoopgamma-75bf6ecd2173d7e6b37b9709502997fbf75b2a90.tar.bz2
libcoopgamma-75bf6ecd2173d7e6b37b9709502997fbf75b2a90.tar.xz
Fix warnings
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'src/libcoopgamma.h')
-rw-r--r--src/libcoopgamma.h136
1 files changed, 83 insertions, 53 deletions
diff --git a/src/libcoopgamma.h b/src/libcoopgamma.h
index 341bd1a..e4764bd 100644
--- a/src/libcoopgamma.h
+++ b/src/libcoopgamma.h
@@ -20,11 +20,19 @@
+#include <limits.h>
#include <stddef.h>
#include <stdint.h>
+#if defined(__clang__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdocumentation"
+#endif
+
+
+
/**
* Unmarshal was successful
*/
@@ -266,7 +274,7 @@ typedef struct libcoopgamma_ramps##suffix \
*/ \
type* blue; \
\
-} libcoopgamma_ramps##suffix##_t;
+} libcoopgamma_ramps##suffix##_t
/**
* `typedef struct libcoopgamma_ramps8 libcoopgamma_ramps8_t`
@@ -318,11 +326,6 @@ LIBCOOPGAMMA_RAMPS__(d, double);
typedef struct libcoopgamma_filter
{
/**
- * The data type and bit-depth of the ramp stops
- */
- libcoopgamma_depth_t depth;
-
- /**
* The priority of the filter, higher priority
* is applied first. The gamma correction should
* have priority 0.
@@ -350,6 +353,11 @@ typedef struct libcoopgamma_filter
libcoopgamma_lifespan_t lifespan;
/**
+ * The data type and bit-depth of the ramp stops
+ */
+ libcoopgamma_depth_t depth;
+
+ /**
* The gamma ramp adjustments of the filter
*/
union
@@ -405,6 +413,17 @@ typedef struct libcoopgamma_crtc_info
libcoopgamma_depth_t depth;
/**
+ * Is gamma adjustments supported on the CRTC?
+ * If not, `.depth`, `.red_size`, `.green_size`,
+ * and `.blue_size` are undefined
+ */
+ libcoopgamma_support_t supported;
+
+#if INT_MAX != LONG_MAX
+ int padding__;
+#endif
+
+ /**
* The number of stops in the red ramp
*/
size_t red_size;
@@ -419,13 +438,6 @@ typedef struct libcoopgamma_crtc_info
*/
size_t blue_size;
- /**
- * Is gamma adjustments supported on the CRTC?
- * If not, `.depth`, `.red_size`, `.green_size`,
- * and `.blue_size` are undefined
- */
- libcoopgamma_support_t supported;
-
} libcoopgamma_crtc_info_t;
@@ -437,6 +449,18 @@ typedef struct libcoopgamma_crtc_info
typedef struct libcoopgamma_filter_query
{
/**
+ * Do no return filters with higher
+ * priority than this value
+ */
+ int64_t high_priority;
+
+ /**
+ * Do no return filters with lower
+ * priority than this value
+ */
+ int64_t low_priority;
+
+ /**
* The CRTC for which the the current
* filters shall returned
*/
@@ -448,17 +472,9 @@ typedef struct libcoopgamma_filter_query
*/
int coalesce;
- /**
- * Do no return filters with higher
- * priority than this value
- */
- int64_t high_priority;
-
- /**
- * Do no return filters with lower
- * priority than this value
- */
- int64_t low_priority;
+#if INT_MAX != LONG_MAX
+ int padding__;
+#endif
} libcoopgamma_filter_query_t;
@@ -528,11 +544,6 @@ typedef struct libcoopgamma_queried_filter
typedef struct libcoopgamma_filter_table
{
/**
- * The data type and bit-depth of the ramp stops
- */
- libcoopgamma_depth_t depth;
-
- /**
* The number of stops in the red ramp
*/
size_t red_size;
@@ -564,6 +575,15 @@ typedef struct libcoopgamma_filter_table
*/
libcoopgamma_queried_filter_t* filters;
+ /**
+ * The data type and bit-depth of the ramp stops
+ */
+ libcoopgamma_depth_t depth;
+
+#if INT_MAX != LONG_MAX
+ int padding__;
+#endif
+
} libcoopgamma_filter_table_t;
@@ -610,16 +630,32 @@ typedef struct libcoopgamma_error
typedef struct libcoopgamma_context
{
/**
+ * The error of the last failed function call
+ *
+ * This member is undefined after successful function call
+ */
+ libcoopgamma_error_t error;
+
+ /**
* File descriptor for the socket
*/
int fd;
/**
- * The error of the last failed function call
- *
- * This member is undefined after successful function call
+ * Whether `libcoopgamma_synchronise` have
+ * read the empty end-of-headers line
*/
- libcoopgamma_error_t error;
+ int have_all_headers;
+
+ /**
+ * Whether `libcoopgamma_synchronise` is reading
+ * a corrupt but recoverable message
+ */
+ int bad_message;
+
+#if INT_MAX != LONG_MAX
+ int padding__;
+#endif
/**
* Message ID of the next message
@@ -627,6 +663,13 @@ typedef struct libcoopgamma_context
uint32_t message_id;
/**
+ * The ID of outbound message to which the inbound
+ * message being read by `libcoopgamma_synchronise`
+ * is a response
+ */
+ uint32_t in_response_to;
+
+ /**
* Buffer with the outbound message
*/
char* outbound;
@@ -678,25 +721,6 @@ typedef struct libcoopgamma_context
*/
size_t curline;
- /**
- * The ID of outbound message to which the inbound
- * message being read by `libcoopgamma_synchronise`
- * is a response
- */
- uint32_t in_response_to;
-
- /**
- * Whether `libcoopgamma_synchronise` have
- * read the empty end-of-headers line
- */
- int have_all_headers;
-
- /**
- * Whether `libcoopgamma_synchronise` is reading
- * a corrupt but recoverable message
- */
- int bad_message;
-
} libcoopgamma_context_t;
@@ -768,7 +792,7 @@ typedef struct libcoopgamma_async_context
* `this->red_size`, `this->green_size`, and `this->blue_size` must already be set
*
* @param this The record to initialise
- * @para width The `sizeof(*(this->red))`
+ * @param width The `sizeof(*(this->red))`
* @return Zero on success, -1 on error
*/
int (libcoopgamma_ramps_initialise)(void* restrict, size_t);
@@ -1468,5 +1492,11 @@ int libcoopgamma_set_gamma_sync(libcoopgamma_filter_t* restrict, libcoopgamma_de
+#if defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
+
+
#endif