Change license and style, reorganise file, make makefile portable, and fix bugs1.3

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 18 insertions, 43 deletions

diff --git a/src/state.h b/state.h
index 1cbe482..f707c81 100644
--- a/src/state.h
+++ b/state.h
@@ -1,60 +1,39 @@
-/**
- * coopgammad -- Cooperative gamma server
- * Copyright (C) 2016  Mattias Andrée (maandree@kth.se)
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/* See LICENSE file for copyright and license details. */
 #ifndef STATE_H
 #define STATE_H
 
-
-#include "types/message.h"
-#include "types/ring.h"
-#include "types/output.h"
+#include "types-message.h"
+#include "types-ring.h"
+#include "types-output.h"
 
 #include <libgamma.h>
 
 #include <stddef.h>
 #include <signal.h>
 
-
-
 #ifndef GCC_ONLY
 # if defined(__GNUC__) && !defined(__clang__)
-#  define GCC_ONLY(...)  __VA_ARGS__
+#  define GCC_ONLY(...) __VA_ARGS__
 # else
-#  define GCC_ONLY(...)  /* nothing */
+#  define GCC_ONLY(...) /* nothing */
 # endif
 #endif
 
-
-
 /**
  * The name of the process
  */
-extern char* restrict argv0;
+extern char *restrict argv0;
 
 /**
  * The real pathname of the process's binary,
  * `NULL` if `argv0` is satisfactory
  */
-extern char* restrict argv0_real;
+extern char *restrict argv0_real;
 
 /**
  * Array of all outputs
  */
-extern struct output* restrict outputs;
+extern struct output *restrict outputs;
 
 /**
  * The nubmer of elements in `outputs`
@@ -92,7 +71,7 @@ extern volatile sig_atomic_t connection;
  * Unused slots, with index less than `connections_used`,
  * should have the value -1 (negative)
  */
-extern int* restrict connections;
+extern int *restrict connections;
 
 /**
  * The number of elements allocated for `connections`
@@ -112,12 +91,12 @@ extern size_t connections_used;
 /**
  * The clients' connections' inbound-message buffers
  */
-extern struct message* restrict inbound;
+extern struct message *restrict inbound;
 
 /**
  * The clients' connections' outbound-message buffers
  */
-extern struct ring* restrict outbound;
+extern struct ring *restrict outbound;
 
 /**
  * Is the server connect to the display?
@@ -134,7 +113,7 @@ extern int method;
 /**
  * The site's name, may be `NULL`
  */
-extern char* restrict sitename;
+extern char *restrict sitename;
 
 /**
  * The libgamma site state
@@ -144,20 +123,18 @@ extern libgamma_site_state_t site;
 /**
  * The libgamma partition states
  */
-extern libgamma_partition_state_t* restrict partitions;
+extern libgamma_partition_state_t *restrict partitions;
 
 /**
  * The libgamma CRTC states
  */
-extern libgamma_crtc_state_t* restrict crtcs;
+extern libgamma_crtc_state_t *restrict crtcs;
 
 /**
  * Preserve gamma ramps at priority 0?
  */
 extern int preserve;
 
-
-
 /**
  * Dump the state to stderr
  */
@@ -176,7 +153,7 @@ void state_destroy(void);
  *               this buffer needs
  * @return       The number of marshalled bytes
  */
-size_t state_marshal(void* restrict buf);
+size_t state_marshal(void *restrict buf);
 
 /**
  * Unmarshal the state
@@ -184,9 +161,7 @@ size_t state_marshal(void* restrict buf);
  * @param   buf  Buffer for the marshalled data
  * @return       The number of unmarshalled bytes, 0 on error
  */
-GCC_ONLY(__attribute__((nonnull)))
-size_t state_unmarshal(const void* restrict buf);
-
+GCC_ONLY(__attribute__((__nonnull__)))
+size_t state_unmarshal(const void *restrict buf);
 
 #endif
-