---
server/Makefile.am | 56 +++++++++++-----------
server/{char_device.c => char-device.c} | 2 +-
server/{char_device.h => char-device.h} | 8 ++--
server/dcc-encoders.h | 10 ++--
server/display-channel.h | 14 +++---
...glz_encoder_dictionary.c => glz-encoder-dict.c} | 4 +-
...glz_encoder_dictionary.h => glz-encoder-dict.h} | 8 ++--
...r_dictionary_protected.h => glz-encoder-priv.h} | 6 +--
server/{glz_encoder.c => glz-encoder.c} | 4 +-
server/{glz_encoder.h => glz-encoder.h} | 2 +-
server/{spice_image_cache.c => image-cache.c} | 2 +-
server/{spice_image_cache.h => image-cache.h} | 4 +-
server/{inputs_channel.c => inputs-channel.c} | 6 +--
server/{inputs_channel.h => inputs-channel.h} | 2 +-
server/{jpeg_encoder.c => jpeg-encoder.c} | 2 +-
server/{jpeg_encoder.h => jpeg-encoder.h} | 0
server/{main_channel.c => main-channel.c} | 6 +--
server/{main_channel.h => main-channel.h} | 0
server/{main_dispatcher.c => main-dispatcher.c} | 2 +-
server/{main_dispatcher.h => main-dispatcher.h} | 0
server/{red_memslots.c => memslot.c} | 2 +-
server/{red_memslots.h => memslot.h} | 4 +-
.../{migration_protocol.h => migration-protocol.h} | 2 +-
server/{mjpeg_encoder.c => mjpeg-encoder.c} | 2 +-
server/{mjpeg_encoder.h => mjpeg-encoder.h} | 0
server/red_channel.c | 2 +-
server/red_dispatcher.c | 2 +-
server/red_parse_qxl.c | 2 +-
server/red_parse_qxl.h | 2 +-
server/red_record_qxl.c | 4 +-
server/red_record_qxl.h | 2 +-
server/red_replay_qxl.c | 2 +-
server/reds.c | 12 ++---
server/reds.h | 4 +-
server/reds_stream.c | 2 +-
server/smartcard.c | 4 +-
server/{snd_worker.c => sound.c} | 4 +-
server/{snd_worker.h => sound.h} | 4 +-
server/spicevmc.c | 4 +-
server/stream.h | 4 +-
server/{reds_sw_canvas.c => sw-canvas.c} | 2 +-
server/{reds_sw_canvas.h => sw-canvas.h} | 4 +-
server/{zlib_encoder.c => zlib-encoder.c} | 2 +-
server/{zlib_encoder.h => zlib-encoder.h} | 0
44 files changed, 105 insertions(+), 105 deletions(-)
rename server/{char_device.c => char-device.c} (99%)
rename server/{char_device.h => char-device.h} (98%)
rename server/{glz_encoder_dictionary.c => glz-encoder-dict.c} (99%)
rename server/{glz_encoder_dictionary.h => glz-encoder-dict.h} (95%)
rename server/{glz_encoder_dictionary_protected.h => glz-encoder-priv.h} (98%)
rename server/{glz_encoder.c => glz-encoder.c} (99%)
rename server/{glz_encoder.h => glz-encoder.h} (98%)
rename server/{spice_image_cache.c => image-cache.c} (99%)
rename server/{spice_image_cache.h => image-cache.h} (97%)
rename server/{inputs_channel.c => inputs-channel.c} (99%)
rename server/{inputs_channel.h => inputs-channel.h} (95%)
rename server/{jpeg_encoder.c => jpeg-encoder.c} (99%)
rename server/{jpeg_encoder.h => jpeg-encoder.h} (100%)
rename server/{main_channel.c => main-channel.c} (99%)
rename server/{main_channel.h => main-channel.h} (100%)
rename server/{main_dispatcher.c => main-dispatcher.c} (99%)
rename server/{main_dispatcher.h => main-dispatcher.h} (100%)
rename server/{red_memslots.c => memslot.c} (99%)
rename server/{red_memslots.h => memslot.h} (98%)
rename server/{migration_protocol.h => migration-protocol.h} (99%)
rename server/{mjpeg_encoder.c => mjpeg-encoder.c} (99%)
rename server/{mjpeg_encoder.h => mjpeg-encoder.h} (100%)
rename server/{snd_worker.c => sound.c} (99%)
rename server/{snd_worker.h => sound.h} (96%)
rename server/{reds_sw_canvas.c => sw-canvas.c} (96%)
rename server/{reds_sw_canvas.h => sw-canvas.h} (93%)
rename server/{zlib_encoder.c => zlib-encoder.c} (99%)
rename server/{zlib_encoder.h => zlib-encoder.h} (100%)
diff --git a/server/Makefile.am b/server/Makefile.am
index 6b45a42..e964fb1 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -66,25 +66,25 @@ libspice_server_la_SOURCES = \
agent-msg-filter.c \
agent-msg-filter.h \
cache-item.h \
- char_device.c \
- char_device.h \
+ char-device.c \
+ char-device.h \
demarshallers.h \
- glz_encoder.c \
- glz_encoder.h \
+ glz-encoder.c \
+ glz-encoder.h \
glz_encoder_config.h \
- glz_encoder_dictionary.c \
- glz_encoder_dictionary.h \
- glz_encoder_dictionary_protected.h \
- inputs_channel.c \
- inputs_channel.h \
- jpeg_encoder.c \
- jpeg_encoder.h \
+ glz-encoder-dict.c \
+ glz-encoder-dict.h \
+ glz-encoder-priv.h \
+ inputs-channel.c \
+ inputs-channel.h \
+ jpeg-encoder.c \
+ jpeg-encoder.h \
lz4_encoder.c \
lz4_encoder.h \
- main_channel.c \
- main_channel.h \
- mjpeg_encoder.c \
- mjpeg_encoder.h \
+ main-channel.c \
+ main-channel.h \
+ mjpeg-encoder.c \
+ mjpeg-encoder.h \
red_channel.c \
red_channel.h \
red_common.h \
@@ -92,11 +92,11 @@ libspice_server_la_SOURCES = \
dispatcher.h \
red_dispatcher.c \
red_dispatcher.h \
- main_dispatcher.c \
- main_dispatcher.h \
- migration_protocol.h \
- red_memslots.c \
- red_memslots.h \
+ main-dispatcher.c \
+ main-dispatcher.h \
+ migration-protocol.h \
+ memslot.c \
+ memslot.h \
red_parse_qxl.c \
red_record_qxl.c \
red_record_qxl.h \
@@ -114,20 +114,20 @@ libspice_server_la_SOURCES = \
reds-private.h \
reds_stream.c \
reds_stream.h \
- reds_sw_canvas.c \
- reds_sw_canvas.h \
- snd_worker.c \
- snd_worker.h \
+ sw-canvas.c \
+ sw-canvas.h \
+ sound.c \
+ sound.h \
stat.h \
spicevmc.c \
spice_timer_queue.c \
spice_timer_queue.h \
- zlib_encoder.c \
- zlib_encoder.h \
+ zlib-encoder.c \
+ zlib-encoder.h \
spice_bitmap_utils.h \
spice_bitmap_utils.c \
- spice_image_cache.h \
- spice_image_cache.c \
+ image-cache.h \
+ image-cache.c \
pixmap-cache.h \
pixmap-cache.c \
tree.h \
diff --git a/server/char_device.c b/server/char-device.c
similarity index 99%
rename from server/char_device.c
rename to server/char-device.c
index ae7cb98..3790fab 100644
--- a/server/char_device.c
+++ b/server/char-device.c
@@ -21,7 +21,7 @@
#include <config.h>
-#include "char_device.h"
+#include "char-device.h"
#include "red_channel.h"
#include "reds.h"
diff --git a/server/char_device.h b/server/char-device.h
similarity index 98%
rename from server/char_device.h
rename to server/char-device.h
index 55d1ee6..7449c6c 100644
--- a/server/char_device.h
+++ b/server/char-device.h
@@ -15,12 +15,12 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __CHAR_DEVICE_H__
-#define __CHAR_DEVICE_H__
+#ifndef CHAR_DEVICE_H_
+#define CHAR_DEVICE_H_
#include "spice.h"
#include "red_channel.h"
-#include "migration_protocol.h"
+#include "migration-protocol.h"
/*
* Shared code for char devices, mainly for flow control.
@@ -213,4 +213,4 @@ SpiceCharDeviceState *spicevmc_device_connect(SpiceCharDeviceInstance *sin,
uint8_t channel_type);
void spicevmc_device_disconnect(SpiceCharDeviceInstance *char_device);
-#endif // __CHAR_DEVICE_H__
+#endif // CHAR_DEVICE_H_
diff --git a/server/dcc-encoders.h b/server/dcc-encoders.h
index 5de66f7..a0a5c64 100644
--- a/server/dcc-encoders.h
+++ b/server/dcc-encoders.h
@@ -23,14 +23,14 @@
#include "common/quic.h"
#include "red_channel.h"
#include "red_parse_qxl.h"
-#include "spice_image_cache.h"
-#include "glz_encoder_dictionary.h"
-#include "glz_encoder.h"
-#include "jpeg_encoder.h"
+#include "image-cache.h"
+#include "glz-encoder-dict.h"
+#include "glz-encoder.h"
+#include "jpeg-encoder.h"
#ifdef USE_LZ4
#include "lz4_encoder.h"
#endif
-#include "zlib_encoder.h"
+#include "zlib-encoder.h"
typedef struct RedCompressBuf RedCompressBuf;
typedef struct GlzDrawableInstanceItem GlzDrawableInstanceItem;
diff --git a/server/display-channel.h b/server/display-channel.h
index a990e09..50f6c5e 100644
--- a/server/display-channel.h
+++ b/server/display-channel.h
@@ -25,22 +25,22 @@
#include "reds_stream.h"
#include "cache-item.h"
#include "pixmap-cache.h"
-#include "reds_sw_canvas.h"
+#include "sw-canvas.h"
#include "stat.h"
#include "reds.h"
-#include "mjpeg_encoder.h"
-#include "red_memslots.h"
+#include "mjpeg-encoder.h"
+#include "memslot.h"
#include "red_parse_qxl.h"
#include "red_record_qxl.h"
#include "demarshallers.h"
#include "red_channel.h"
#include "red_dispatcher.h"
#include "dispatcher.h"
-#include "main_channel.h"
-#include "migration_protocol.h"
-#include "main_dispatcher.h"
+#include "main-channel.h"
+#include "migration-protocol.h"
+#include "main-dispatcher.h"
#include "spice_bitmap_utils.h"
-#include "spice_image_cache.h"
+#include "image-cache.h"
#include "utils.h"
#include "tree.h"
#include "stream.h"
diff --git a/server/glz_encoder_dictionary.c b/server/glz-encoder-dict.c
similarity index 99%
rename from server/glz_encoder_dictionary.c
rename to server/glz-encoder-dict.c
index 70226e1..1fd6753 100644
--- a/server/glz_encoder_dictionary.c
+++ b/server/glz-encoder-dict.c
@@ -22,8 +22,8 @@
#include <string.h>
#include <stdio.h>
-#include "glz_encoder_dictionary.h"
-#include "glz_encoder_dictionary_protected.h"
+#include "glz-encoder-dict.h"
+#include "glz-encoder-priv.h"
/* turning all used images to free ones. If they are alive, calling the free_image callback for
each one */
diff --git a/server/glz_encoder_dictionary.h b/server/glz-encoder-dict.h
similarity index 95%
rename from server/glz_encoder_dictionary.h
rename to server/glz-encoder-dict.h
index eb57aa5..960f165 100644
--- a/server/glz_encoder_dictionary.h
+++ b/server/glz-encoder-dict.h
@@ -15,8 +15,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_GLZ_ENCODER_DICTIONARY
-#define _H_GLZ_ENCODER_DICTIONARY
+#ifndef GLZ_ENCODER_DICT_H_
+#define GLZ_ENCODER_DICT_H_
#include <stdint.h>
#include "glz_encoder_config.h"
@@ -24,7 +24,7 @@
/*
Interface for maintaining lz dictionary that is shared among several encoders.
The interface for accessing the dictionary for encoding purposes is located in
- glz_encoder_dictionary_protected.h
+ glz-encoder-priv.h
*/
typedef void GlzEncDictContext;
@@ -66,4 +66,4 @@ void glz_enc_dictionary_reset(GlzEncDictContext *opaque_dict, GlzEncoderUsrConte
void glz_enc_dictionary_remove_image(GlzEncDictContext *opaque_dict,
GlzEncDictImageContext *image, GlzEncoderUsrContext *usr);
-#endif // _H_GLZ_ENCODER_DICTIONARY
+#endif // GLZ_ENCODER_DICT_H_
diff --git a/server/glz_encoder_dictionary_protected.h b/server/glz-encoder-priv.h
similarity index 98%
rename from server/glz_encoder_dictionary_protected.h
rename to server/glz-encoder-priv.h
index 098684f..a408966 100644
--- a/server/glz_encoder_dictionary_protected.h
+++ b/server/glz-encoder-priv.h
@@ -15,8 +15,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_GLZ_ENCODER_DICTIONARY_PROTECTED
-#define _H_GLZ_ENCODER_DICTIONARY_PROTECTED
+#ifndef GLZ_ENCODER_PRIV_H_
+#define GLZ_ENCODER_PRIV_H_
/* Interface for using the dictionary for encoding.
Data structures are exposed for the encoder for efficiency
@@ -183,4 +183,4 @@ void glz_dictionary_post_encode(uint32_t encoder_id, GlzEncoderUsrContext *usr,
(dict)->window.encoders_heads[enc_id]].pixels_so_far <= \
ref_seg->pixels_so_far)))
-#endif // _H_GLZ_ENCODER_DICTIONARY_PROTECTED
+#endif // GLZ_ENCODER_PRIV_H_
diff --git a/server/glz_encoder.c b/server/glz-encoder.c
similarity index 99%
rename from server/glz_encoder.c
rename to server/glz-encoder.c
index 65f4478..f761330 100644
--- a/server/glz_encoder.c
+++ b/server/glz-encoder.c
@@ -21,8 +21,8 @@
#include <glib.h>
#include <pthread.h>
#include <stdio.h>
-#include "glz_encoder.h"
-#include "glz_encoder_dictionary_protected.h"
+#include "glz-encoder.h"
+#include "glz-encoder-priv.h"
/* Holds a specific data for one encoder, and data that is relevant for the current image encoded */
diff --git a/server/glz_encoder.h b/server/glz-encoder.h
similarity index 98%
rename from server/glz_encoder.h
rename to server/glz-encoder.h
index e91f515..93164ed 100644
--- a/server/glz_encoder.h
+++ b/server/glz-encoder.h
@@ -22,7 +22,7 @@
#include <stdint.h>
#include "common/lz_common.h"
-#include "glz_encoder_dictionary.h"
+#include "glz-encoder-dict.h"
#include "glz_encoder_config.h"
typedef void GlzEncoderContext;
diff --git a/server/spice_image_cache.c b/server/image-cache.c
similarity index 99%
rename from server/spice_image_cache.c
rename to server/image-cache.c
index 1c5de24..f4d2ee9 100644
--- a/server/spice_image_cache.c
+++ b/server/image-cache.c
@@ -18,7 +18,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include "spice_image_cache.h"
+#include "image-cache.h"
#include "red_parse_qxl.h"
#include "display-channel.h"
diff --git a/server/spice_image_cache.h b/server/image-cache.h
similarity index 97%
rename from server/spice_image_cache.h
rename to server/image-cache.h
index 6d6b32d..d66c7ff 100644
--- a/server/spice_image_cache.h
+++ b/server/image-cache.h
@@ -15,8 +15,8 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef H_SPICE_IMAGE_CACHE
-#define H_SPICE_IMAGE_CACHE
+#ifndef IMAGE_CACHE_H_
+#define IMAGE_CACHE_H_
#include <inttypes.h>
diff --git a/server/inputs_channel.c b/server/inputs-channel.c
similarity index 99%
rename from server/inputs_channel.c
rename to server/inputs-channel.c
index 2934572..3e8fccd 100644
--- a/server/inputs_channel.c
+++ b/server/inputs-channel.c
@@ -39,9 +39,9 @@
#include "reds.h"
#include "reds_stream.h"
#include "red_channel.h"
-#include "main_channel.h"
-#include "inputs_channel.h"
-#include "migration_protocol.h"
+#include "main-channel.h"
+#include "inputs-channel.h"
+#include "migration-protocol.h"
// TODO: RECEIVE_BUF_SIZE used to be the same for inputs_channel and main_channel
// since it was defined once in reds.c which contained both.
diff --git a/server/inputs_channel.h b/server/inputs-channel.h
similarity index 95%
rename from server/inputs_channel.h
rename to server/inputs-channel.h
index 672ca83..7f7ace0 100644
--- a/server/inputs_channel.h
+++ b/server/inputs-channel.h
@@ -19,7 +19,7 @@
#define _INPUTS_CHANNEL_H_
// Inputs channel, dealing with keyboard, mouse, tablet.
-// This include should only be used by reds.c and inputs_channel.c
+// This include should only be used by reds.c and inputs-channel.c
#include <stdint.h>
#include <spice/vd_agent.h>
diff --git a/server/jpeg_encoder.c b/server/jpeg-encoder.c
similarity index 99%
rename from server/jpeg_encoder.c
rename to server/jpeg-encoder.c
index 0296e9b..8e54dd2 100644
--- a/server/jpeg_encoder.c
+++ b/server/jpeg-encoder.c
@@ -19,7 +19,7 @@
#endif
#include "red_common.h"
-#include "jpeg_encoder.h"
+#include "jpeg-encoder.h"
#include <jpeglib.h>
typedef struct JpegEncoder {
diff --git a/server/jpeg_encoder.h b/server/jpeg-encoder.h
similarity index 100%
rename from server/jpeg_encoder.h
rename to server/jpeg-encoder.h
diff --git a/server/main_channel.c b/server/main-channel.c
similarity index 99%
rename from server/main_channel.c
rename to server/main-channel.c
index 1af6baa..5ca5bba 100644
--- a/server/main_channel.c
+++ b/server/main-channel.c
@@ -41,12 +41,12 @@
#include "common/ring.h"
#include "demarshallers.h"
-#include "main_channel.h"
+#include "main-channel.h"
#include "red_channel.h"
#include "red_common.h"
#include "reds.h"
-#include "migration_protocol.h"
-#include "main_dispatcher.h"
+#include "migration-protocol.h"
+#include "main-dispatcher.h"
#include "utils.h"
#define ZERO_BUF_SIZE 4096
diff --git a/server/main_channel.h b/server/main-channel.h
similarity index 100%
rename from server/main_channel.h
rename to server/main-channel.h
diff --git a/server/main_dispatcher.c b/server/main-dispatcher.c
similarity index 99%
rename from server/main_dispatcher.c
rename to server/main-dispatcher.c
index 6ad9d89..eb7cee6 100644
--- a/server/main_dispatcher.c
+++ b/server/main-dispatcher.c
@@ -23,7 +23,7 @@
#include "red_common.h"
#include "dispatcher.h"
-#include "main_dispatcher.h"
+#include "main-dispatcher.h"
#include "red_channel.h"
#include "reds.h"
diff --git a/server/main_dispatcher.h b/server/main-dispatcher.h
similarity index 100%
rename from server/main_dispatcher.h
rename to server/main-dispatcher.h
diff --git a/server/red_memslots.c b/server/memslot.c
similarity index 99%
rename from server/red_memslots.c
rename to server/memslot.c
index 0d2d963..e7ee04c 100644
--- a/server/red_memslots.c
+++ b/server/memslot.c
@@ -22,7 +22,7 @@
#include <inttypes.h>
#include "red_common.h"
-#include "red_memslots.h"
+#include "memslot.h"
static unsigned long __get_clean_virt(RedMemSlotInfo *info, QXLPHYSICAL addr)
{
diff --git a/server/red_memslots.h b/server/memslot.h
similarity index 98%
rename from server/red_memslots.h
rename to server/memslot.h
index a40050c..1fba4b8 100644
--- a/server/red_memslots.h
+++ b/server/memslot.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_REDMEMSLOTS
-#define _H_REDMEMSLOTS
+#ifndef MEMSLOT_H_
+#define MEMSLOT_H_
#include "red_common.h"
diff --git a/server/migration_protocol.h b/server/migration-protocol.h
similarity index 99%
rename from server/migration_protocol.h
rename to server/migration-protocol.h
index 21d3ec8..c1d97ef 100644
--- a/server/migration_protocol.h
+++ b/server/migration-protocol.h
@@ -20,7 +20,7 @@
#include <spice/macros.h>
#include <spice/vd_agent.h>
-#include "glz_encoder_dictionary.h"
+#include "glz-encoder-dict.h"
/* ************************************************
* src-server to dst-server migration data messages
diff --git a/server/mjpeg_encoder.c b/server/mjpeg-encoder.c
similarity index 99%
rename from server/mjpeg_encoder.c
rename to server/mjpeg-encoder.c
index 9b331c1..04c95a6 100644
--- a/server/mjpeg_encoder.c
+++ b/server/mjpeg-encoder.c
@@ -20,7 +20,7 @@
#endif
#include "red_common.h"
-#include "mjpeg_encoder.h"
+#include "mjpeg-encoder.h"
#include "utils.h"
#include <jerror.h>
#include <jpeglib.h>
diff --git a/server/mjpeg_encoder.h b/server/mjpeg-encoder.h
similarity index 100%
rename from server/mjpeg_encoder.h
rename to server/mjpeg-encoder.h
diff --git a/server/red_channel.c b/server/red_channel.c
index 609c83f..948d354 100644
--- a/server/red_channel.c
+++ b/server/red_channel.c
@@ -42,7 +42,7 @@
#include "red_channel.h"
#include "reds.h"
#include "reds_stream.h"
-#include "main_dispatcher.h"
+#include "main-dispatcher.h"
#include "utils.h"
typedef struct EmptyMsgPipeItem {
diff --git a/server/red_dispatcher.c b/server/red_dispatcher.c
index a7825f5..b8b77d7 100644
--- a/server/red_dispatcher.c
+++ b/server/red_dispatcher.c
@@ -32,7 +32,7 @@
#include "spice.h"
#include "red_worker.h"
-#include "reds_sw_canvas.h"
+#include "sw-canvas.h"
#include "reds.h"
#include "dispatcher.h"
#include "red_parse_qxl.h"
diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c
index 6e2ca99..522a915 100644
--- a/server/red_parse_qxl.c
+++ b/server/red_parse_qxl.c
@@ -25,7 +25,7 @@
#include "common/lz_common.h"
#include "spice-bitmap-utils.h"
#include "red_common.h"
-#include "red_memslots.h"
+#include "memslot.h"
#include "red_parse_qxl.h"
/* Max size in bytes for any data field used in a QXL command.
diff --git a/server/red_parse_qxl.h b/server/red_parse_qxl.h
index b3b28e1..09059f5 100644
--- a/server/red_parse_qxl.h
+++ b/server/red_parse_qxl.h
@@ -21,7 +21,7 @@
#include <spice/qxl_dev.h>
#include "red_common.h"
-#include "red_memslots.h"
+#include "memslot.h"
typedef struct RedDrawable {
int refs;
diff --git a/server/red_record_qxl.c b/server/red_record_qxl.c
index 17f17bd..52c0e81 100644
--- a/server/red_record_qxl.c
+++ b/server/red_record_qxl.c
@@ -23,9 +23,9 @@
#include <inttypes.h>
#include "red_worker.h"
#include "red_common.h"
-#include "red_memslots.h"
+#include "memslot.h"
#include "red_parse_qxl.h"
-#include "zlib_encoder.h"
+#include "zlib-encoder.h"
#if 0
static void hexdump_qxl(RedMemSlotInfo *slots, int group_id,
diff --git a/server/red_record_qxl.h b/server/red_record_qxl.h
index b737db8..6fcbec9 100644
--- a/server/red_record_qxl.h
+++ b/server/red_record_qxl.h
@@ -21,7 +21,7 @@
#include <spice/qxl_dev.h>
#include "red_common.h"
-#include "red_memslots.h"
+#include "memslot.h"
void red_record_dev_input_primary_surface_create(
FILE *fd, QXLDevSurfaceCreate *surface, uint8_t *line_0);
diff --git a/server/red_replay_qxl.c b/server/red_replay_qxl.c
index ad1a8fd..6e32588 100644
--- a/server/red_replay_qxl.c
+++ b/server/red_replay_qxl.c
@@ -26,7 +26,7 @@
#include "reds.h"
#include "red_worker.h"
#include "red_common.h"
-#include "red_memslots.h"
+#include "memslot.h"
#include "red_parse_qxl.h"
#include "red_replay_qxl.h"
#include <glib.h>
diff --git a/server/reds.c b/server/reds.c
index 8b3c3cb..5891034 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -56,16 +56,16 @@
#include "spice.h"
#include "reds.h"
#include "agent-msg-filter.h"
-#include "inputs_channel.h"
-#include "main_channel.h"
+#include "inputs-channel.h"
+#include "main-channel.h"
#include "red_common.h"
#include "red_dispatcher.h"
-#include "main_dispatcher.h"
-#include "snd_worker.h"
+#include "main-dispatcher.h"
+#include "sound.h"
#include "stat.h"
#include "demarshallers.h"
-#include "char_device.h"
-#include "migration_protocol.h"
+#include "char-device.h"
+#include "migration-protocol.h"
#ifdef USE_SMARTCARD
#include "smartcard.h"
#endif
diff --git a/server/reds.h b/server/reds.h
index fcdc5eb..0584694 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -28,7 +28,7 @@
#include "common/messages.h"
#include "spice.h"
#include "red_channel.h"
-#include "migration_protocol.h"
+#include "migration-protocol.h"
struct QXLState {
QXLInterface *qif;
@@ -75,7 +75,7 @@ extern SpiceImageCompression image_compression;
extern spice_wan_compression_t jpeg_state;
extern spice_wan_compression_t zlib_glz_state;
-// Temporary measures to make splitting reds.c to inputs_channel.c easier
+// Temporary measures to make splitting reds.c to inputs-channel.c easier
/* should be called only from main_dispatcher */
void reds_client_disconnect(RedClient *client);
diff --git a/server/reds_stream.c b/server/reds_stream.c
index 3b47391..6f5c43f 100644
--- a/server/reds_stream.c
+++ b/server/reds_stream.c
@@ -19,7 +19,7 @@
#include <config.h>
#endif
-#include "main_dispatcher.h"
+#include "main-dispatcher.h"
#include "red_common.h"
#include "reds_stream.h"
#include "common/log.h"
diff --git a/server/smartcard.c b/server/smartcard.c
index aad22aa..928e27b8 100644
--- a/server/smartcard.c
+++ b/server/smartcard.c
@@ -23,10 +23,10 @@
#include <vscard_common.h>
#include "reds.h"
-#include "char_device.h"
+#include "char-device.h"
#include "red_channel.h"
#include "smartcard.h"
-#include "migration_protocol.h"
+#include "migration-protocol.h"
/*
* TODO: the code doesn't really support multiple readers.
diff --git a/server/snd_worker.c b/server/sound.c
similarity index 99%
rename from server/snd_worker.c
rename to server/sound.c
index b039939..a91d56e 100644
--- a/server/snd_worker.c
+++ b/server/sound.c
@@ -31,10 +31,10 @@
#include "spice.h"
#include "red_common.h"
-#include "main_channel.h"
+#include "main-channel.h"
#include "reds.h"
#include "red_dispatcher.h"
-#include "snd_worker.h"
+#include "sound.h"
#include "common/snd_codec.h"
#include "demarshallers.h"
diff --git a/server/snd_worker.h b/server/sound.h
similarity index 96%
rename from server/snd_worker.h
rename to server/sound.h
index 7cc4db5..97f8410 100644
--- a/server/snd_worker.h
+++ b/server/sound.h
@@ -15,8 +15,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_SND_WORKER
-#define _H_SND_WORKER
+#ifndef SOUND_H_
+#define SOUND_H_
#include "spice.h"
diff --git a/server/spicevmc.c b/server/spicevmc.c
index d37b1ec..52a29a4 100644
--- a/server/spicevmc.c
+++ b/server/spicevmc.c
@@ -30,10 +30,10 @@
#include "common/generated_server_marshallers.h"
-#include "char_device.h"
+#include "char-device.h"
#include "red_channel.h"
#include "reds.h"
-#include "migration_protocol.h"
+#include "migration-protocol.h"
/* todo: add flow control. i.e.,
* (a) limit the tokens available for the client
diff --git a/server/stream.h b/server/stream.h
index 214d1df..cb2b844 100644
--- a/server/stream.h
+++ b/server/stream.h
@@ -20,10 +20,10 @@
#include <glib.h>
#include "utils.h"
-#include "mjpeg_encoder.h"
+#include "mjpeg-encoder.h"
#include "common/region.h"
#include "red_channel.h"
-#include "spice_image_cache.h"
+#include "image-cache.h"
#define RED_STREAM_DETACTION_MAX_DELTA ((1000 * 1000 * 1000) / 5) // 1/5 sec
#define RED_STREAM_CONTINUS_MAX_DELTA (1000 * 1000 * 1000)
diff --git a/server/reds_sw_canvas.c b/server/sw-canvas.c
similarity index 96%
rename from server/reds_sw_canvas.c
rename to server/sw-canvas.c
index 297df37..0ef050e 100644
--- a/server/reds_sw_canvas.c
+++ b/server/sw-canvas.c
@@ -20,7 +20,7 @@
#include "common/spice_common.h"
-#include "reds_sw_canvas.h"
+#include "sw-canvas.h"
#define SW_CANVAS_IMAGE_CACHE
#include "common/sw_canvas.c"
#undef SW_CANVAS_IMAGE_CACHE
diff --git a/server/reds_sw_canvas.h b/server/sw-canvas.h
similarity index 93%
rename from server/reds_sw_canvas.h
rename to server/sw-canvas.h
index 96a4c0c..5ffba3d 100644
--- a/server/reds_sw_canvas.h
+++ b/server/sw-canvas.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_REDS_SW_CANVAS
-#define _H_REDS_SW_CANVAS
+#ifndef SW_CANVAS_H_
+#define SW_CANVAS_H_
#define SW_CANVAS_IMAGE_CACHE
#include "common/sw_canvas.h"
diff --git a/server/zlib_encoder.c b/server/zlib-encoder.c
similarity index 99%
rename from server/zlib_encoder.c
rename to server/zlib-encoder.c
index a3d2aa6..069a448 100644
--- a/server/zlib_encoder.c
+++ b/server/zlib-encoder.c
@@ -20,7 +20,7 @@
#endif
#include "red_common.h"
-#include "zlib_encoder.h"
+#include "zlib-encoder.h"
#include <zlib.h>
struct ZlibEncoder {
diff --git a/server/zlib_encoder.h b/server/zlib-encoder.h
similarity index 100%
rename from server/zlib_encoder.h
rename to server/zlib-encoder.h
--
2.4.3
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel