>
> On Thu, 2015-12-03 at 16:26 +0000, Frediano Ziglio wrote:
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxx>
> > Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx>
> > ---
> > NEWS | 2 +-
> > server/Makefile.am | 90
> > +++++++++++----------
> > -
> > server/agent-msg-filter.c | 4 +-
> > server/cache-item.h | 2 +-
> > server/{char_device.c => char-device.c} | 4 +-
> > server/{char_device.h => char-device.h} | 10 +--
> > server/cursor-channel.h | 4 +-
> > server/dcc-encoders.h | 16 ++--
> > server/dcc.h | 2 +-
> > server/display-channel.h | 26 +++----
> > ...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} | 4 +-
> > server/{spice_image_cache.h => image-cache.h} | 6 +-
> > server/{inputs_channel.c => inputs-channel.c} | 12 +--
> > server/{inputs_channel.h => inputs-channel.h} | 2 +-
> > server/{jpeg_encoder.c => jpeg-encoder.c} | 4 +-
> > server/{jpeg_encoder.h => jpeg-encoder.h} | 0
> > server/{lz4_encoder.c => lz4-encoder.c} | 4 +-
> > server/{lz4_encoder.h => lz4-encoder.h} | 0
> > server/{main_channel.c => main-channel.c} | 10 +--
> > server/{main_channel.h => main-channel.h} | 2 +-
> > server/{main_dispatcher.c => main-dispatcher.c} | 6 +-
> > server/{main_dispatcher.h => main-dispatcher.h} | 2 +-
> > server/{red_memslots.c => memslot.c} | 4 +-
> > server/{red_memslots.h => memslot.h} | 8 +-
> > .../{migration_protocol.h => migration-protocol.h} | 2 +-
> > server/{mjpeg_encoder.c => mjpeg-encoder.c} | 4 +-
> > server/{mjpeg_encoder.h => mjpeg-encoder.h} | 2 +-
> > server/pixmap-cache.h | 2 +-
> > server/{red_channel.c => red-channel.c} | 8 +-
> > server/{red_channel.h => red-channel.h} | 6 +-
> > server/{red_common.h => red-common.h} | 0
> > server/{red_dispatcher.c => red-dispatcher.c} | 8 +-
> > server/{red_dispatcher.h => red-dispatcher.h} | 2 +-
> > server/{red_parse_qxl.c => red-parse-qxl.c} | 6 +-
> > server/{red_parse_qxl.h => red-parse-qxl.h} | 4 +-
> > server/{red_record_qxl.c => red-record-qxl.c} | 10 +--
> > server/{red_record_qxl.h => red-record-qxl.h} | 4 +-
> > server/{red_replay_qxl.c => red-replay-qxl.c} | 10 +--
> > server/{red_replay_qxl.h => red-replay-qxl.h} | 0
> > server/{red_worker.c => red-worker.c} | 2 +-
> > server/{red_worker.h => red-worker.h} | 6 +-
> > server/{reds_stream.c => reds-stream.c} | 6 +-
> > server/{reds_stream.h => reds-stream.h} | 0
> > server/reds.c | 18 ++---
> > server/reds.h | 6 +-
> > server/smartcard.c | 6 +-
> > server/{snd_worker.c => sound.c} | 8 +-
> > server/{snd_worker.h => sound.h} | 4 +-
> > server/spice_timer_queue.c | 2 +-
> > server/spicevmc.c | 6 +-
> > server/stream.h | 6 +-
> > server/{reds_sw_canvas.c => sw-canvas.c} | 2 +-
> > server/{reds_sw_canvas.h => sw-canvas.h} | 6 +-
> > server/tests/replay.c | 2 +-
> > server/tests/test_display_base.c | 2 +-
> > server/tree.c | 2 +-
> > server/{zlib_encoder.c => zlib-encoder.c} | 4 +-
> > server/{zlib_encoder.h => zlib-encoder.h} | 0
> > 63 files changed, 202 insertions(+), 202 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} (94%)
> > 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/{lz4_encoder.c => lz4-encoder.c} (98%)
> > rename server/{lz4_encoder.h => lz4-encoder.h} (100%)
> > rename server/{main_channel.c => main-channel.c} (99%)
> > rename server/{main_channel.h => main-channel.h} (99%)
> > rename server/{main_dispatcher.c => main-dispatcher.c} (98%)
> > rename server/{main_dispatcher.h => main-dispatcher.h} (98%)
> > rename server/{red_memslots.c => memslot.c} (99%)
> > rename server/{red_memslots.h => memslot.h} (96%)
> > 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} (99%)
> > rename server/{red_channel.c => red-channel.c} (99%)
> > rename server/{red_channel.h => red-channel.h} (99%)
> > rename server/{red_common.h => red-common.h} (100%)
> > rename server/{red_dispatcher.c => red-dispatcher.c} (99%)
> > rename server/{red_dispatcher.h => red-dispatcher.h} (99%)
> > rename server/{red_parse_qxl.c => red-parse-qxl.c} (99%)
> > rename server/{red_parse_qxl.h => red-parse-qxl.h} (98%)
> > rename server/{red_record_qxl.c => red-record-qxl.c} (99%)
> > rename server/{red_record_qxl.h => red-record-qxl.h} (95%)
> > rename server/{red_replay_qxl.c => red-replay-qxl.c} (99%)
> > rename server/{red_replay_qxl.h => red-replay-qxl.h} (100%)
> > rename server/{red_worker.c => red-worker.c} (99%)
> > rename server/{red_worker.h => red-worker.h} (98%)
> > rename server/{reds_stream.c => reds-stream.c} (99%)
> > rename server/{reds_stream.h => reds-stream.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} (92%)
> > rename server/{zlib_encoder.c => zlib-encoder.c} (98%)
> > rename server/{zlib_encoder.h => zlib-encoder.h} (100%)
> >
> > diff --git a/NEWS b/NEWS
> > index a33f6cf..c05f62a 100644
> > --- a/NEWS
> > +++ b/NEWS
> > @@ -101,7 +101,7 @@ Major changes in 0.11.3:
> > SPICE_MAIN_CAP_AGENT_CONNECTED_TOKENS
> > SPICE_MAIN_CAP_SEAMLESS_MIGRATE
> > * Misc:
> > - * char_device.c: Introducing shared flow control code for char devices
> > + * char-device.c: Introducing shared flow control code for char devices
> > * Enable build without client, cegui and slirp.
> >
> > Major changes in 0.11.0:
> > diff --git a/server/Makefile.am b/server/Makefile.am
> > index 6b45a42..1e7e8fa 100644
> > --- a/server/Makefile.am
> > +++ b/server/Makefile.am
> > @@ -66,45 +66,45 @@ 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 \
> > - lz4_encoder.c \
> > - lz4_encoder.h \
> > - main_channel.c \
> > - main_channel.h \
> > - mjpeg_encoder.c \
> > - mjpeg_encoder.h \
> > - red_channel.c \
> > - red_channel.h \
> > - red_common.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 \
> > + red-channel.c \
> > + red-channel.h \
> > + red-common.h \
> > dispatcher.c \
> > dispatcher.h \
> > - red_dispatcher.c \
> > - red_dispatcher.h \
> > - main_dispatcher.c \
> > - main_dispatcher.h \
> > - migration_protocol.h \
> > - red_memslots.c \
> > - red_memslots.h \
> > - red_parse_qxl.c \
> > - red_record_qxl.c \
> > - red_record_qxl.h \
> > - red_replay_qxl.c \
> > - red_replay_qxl.h \
> > - red_parse_qxl.h \
> > - red_worker.c \
> > - red_worker.h \
> > + red-dispatcher.c \
> > + red-dispatcher.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 \
> > + red-replay-qxl.c \
> > + red-replay-qxl.h \
> > + red-parse-qxl.h \
> > + red-worker.c \
> > + red-worker.h \
> > display-channel.c \
> > display-channel.h \
> > cursor-channel.c \
> > @@ -112,22 +112,22 @@ libspice_server_la_SOURCES = \
> > reds.c \
> > reds.h \
> > reds-private.h \
> > - reds_stream.c \
> > - reds_stream.h \
> > - reds_sw_canvas.c \
> > - reds_sw_canvas.h \
> > - snd_worker.c \
> > - snd_worker.h \
> > + reds-stream.c \
> > + reds-stream.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/agent-msg-filter.c b/server/agent-msg-filter.c
> > index 567e03d..1c1c01f 100644
> > --- a/server/agent-msg-filter.c
> > +++ b/server/agent-msg-filter.c
> > @@ -22,9 +22,9 @@
> > #endif
> >
> > #include <string.h>
> > -#include "red_common.h"
> > +#include "red-common.h"
> > #include "agent-msg-filter.h"
> > -#include "red_dispatcher.h"
> > +#include "red-dispatcher.h"
> >
> > void agent_msg_filter_init(struct AgentMsgFilter *filter,
> > int copy_paste, int file_xfer, int discard_all)
> > diff --git a/server/cache-item.h b/server/cache-item.h
> > index 730e344..7dfb1af 100644
> > --- a/server/cache-item.h
> > +++ b/server/cache-item.h
> > @@ -18,7 +18,7 @@
> > #ifndef CACHE_ITEM_H_
> > # define CACHE_ITEM_H_
> >
> > -#include "red_channel.h"
> > +#include "red-channel.h"
> > #include "common/ring.h"
> >
> > typedef struct CacheItem CacheItem;
> > 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..95d31f7 100644
> > --- a/server/char_device.c
> > +++ b/server/char-device.c
> > @@ -21,8 +21,8 @@
> >
> >
> > #include <config.h>
> > -#include "char_device.h"
> > -#include "red_channel.h"
> > +#include "char-device.h"
> > +#include "red-channel.h"
> > #include "reds.h"
> >
> > #define CHAR_DEVICE_WRITE_TO_TIMEOUT 100
> > 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..ca2e96b 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 "red-channel.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/cursor-channel.h b/server/cursor-channel.h
> > index 887f847..104af20 100644
> > --- a/server/cursor-channel.h
> > +++ b/server/cursor-channel.h
> > @@ -20,8 +20,8 @@
> >
> > #include "spice.h"
> > #include "reds.h"
> > -#include "red_worker.h"
> > -#include "red_parse_qxl.h"
> > +#include "red-worker.h"
> > +#include "red-parse-qxl.h"
> > #include "cache-item.h"
> > #include "stat.h"
> >
> > diff --git a/server/dcc-encoders.h b/server/dcc-encoders.h
> > index 5de66f7..8f61b52 100644
> > --- a/server/dcc-encoders.h
> > +++ b/server/dcc-encoders.h
> > @@ -21,16 +21,16 @@
> > #include <setjmp.h>
> > #include "common/marshaller.h"
> > #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 "red-channel.h"
> > +#include "red-parse-qxl.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"
> > +#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/dcc.h b/server/dcc.h
> > index 7b8a3b8..f9703be 100644
> > --- a/server/dcc.h
> > +++ b/server/dcc.h
> > @@ -18,7 +18,7 @@
> > #ifndef DCC_H_
> > # define DCC_H_
> >
> > -#include "red_worker.h"
> > +#include "red-worker.h"
> > #include "pixmap-cache.h"
> > #include "cache-item.h"
> > #include "dcc-encoders.h"
> > diff --git a/server/display-channel.h b/server/display-channel.h
> > index a990e09..7cbc58d 100644
> > --- a/server/display-channel.h
> > +++ b/server/display-channel.h
> > @@ -21,26 +21,26 @@
> > #include <setjmp.h>
> >
> > #include "common/rect.h"
> > -#include "red_worker.h"
> > -#include "reds_stream.h"
> > +#include "red-worker.h"
> > +#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 "red_parse_qxl.h"
> > -#include "red_record_qxl.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 "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..4237034 100644
> > --- a/server/spice_image_cache.c
> > +++ b/server/image-cache.c
> > @@ -18,8 +18,8 @@
> > #ifdef HAVE_CONFIG_H
> > #include <config.h>
> > #endif
> > -#include "spice_image_cache.h"
> > -#include "red_parse_qxl.h"
> > +#include "image-cache.h"
> > +#include "red-parse-qxl.h"
> > #include "display-channel.h"
> >
> > static ImageCacheItem *image_cache_find(ImageCache *cache, uint64_t id)
> > diff --git a/server/spice_image_cache.h b/server/image-cache.h
> > similarity index 94%
> > rename from server/spice_image_cache.h
> > rename to server/image-cache.h
> > index 6d6b32d..014a45e 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>
> >
> > @@ -24,7 +24,7 @@
> > #include "common/canvas_base.h"
> > #include "common/ring.h"
> >
> > -/* FIXME: move back to display_channel.h (once structs are private) */
> > +/* FIXME: move back to display-channel.h (once structs are private) */
> > typedef struct Drawable Drawable;
> > typedef struct DisplayChannelClient DisplayChannelClient;
> >
> > 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..74aa30d 100644
> > --- a/server/inputs_channel.c
> > +++ b/server/inputs-channel.c
> > @@ -35,13 +35,13 @@
> >
> > #include "demarshallers.h"
> > #include "spice.h"
> > -#include "red_common.h"
> > +#include "red-common.h"
> > #include "reds.h"
> > -#include "reds_stream.h"
> > -#include "red_channel.h"
> > -#include "main_channel.h"
> > -#include "inputs_channel.h"
> > -#include "migration_protocol.h"
> > +#include "reds-stream.h"
> > +#include "red-channel.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..1d090b6 100644
> > --- a/server/jpeg_encoder.c
> > +++ b/server/jpeg-encoder.c
> > @@ -18,8 +18,8 @@
> > #include <config.h>
> > #endif
> >
> > -#include "red_common.h"
> > -#include "jpeg_encoder.h"
> > +#include "red-common.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/lz4_encoder.c b/server/lz4-encoder.c
> > similarity index 98%
> > rename from server/lz4_encoder.c
> > rename to server/lz4-encoder.c
> > index b3e38b2..7b6359f 100644
> > --- a/server/lz4_encoder.c
> > +++ b/server/lz4-encoder.c
> > @@ -24,8 +24,8 @@
> >
> > #include <arpa/inet.h>
> > #include <lz4.h>
> > -#include "red_common.h"
> > -#include "lz4_encoder.h"
> > +#include "red-common.h"
> > +#include "lz4-encoder.h"
> >
> > typedef struct Lz4Encoder {
> > Lz4EncoderUsrContext *usr;
> > diff --git a/server/lz4_encoder.h b/server/lz4-encoder.h
> > similarity index 100%
> > rename from server/lz4_encoder.h
> > rename to server/lz4-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..25e3868 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 "red_channel.h"
> > -#include "red_common.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 99%
> > rename from server/main_channel.h
> > rename to server/main-channel.h
> > index 9bd20f1..fab383a 100644
> > --- a/server/main_channel.h
> > +++ b/server/main-channel.h
> > @@ -21,7 +21,7 @@
> > #include <stdint.h>
> > #include <spice/vd_agent.h>
> > #include "common/marshaller.h"
> > -#include "red_channel.h"
> > +#include "red-channel.h"
> >
> > // TODO: Defines used to calculate receive buffer size, and also by reds.c
> > // other options: is to make a reds_main_consts.h, to duplicate defines.
> > diff --git a/server/main_dispatcher.c b/server/main-dispatcher.c
> > similarity index 98%
> > rename from server/main_dispatcher.c
> > rename to server/main-dispatcher.c
> > index 6ad9d89..78b2fed 100644
> > --- a/server/main_dispatcher.c
> > +++ b/server/main-dispatcher.c
> > @@ -21,10 +21,10 @@
> > #include <errno.h>
> > #include <pthread.h>
> >
> > -#include "red_common.h"
> > +#include "red-common.h"
> > #include "dispatcher.h"
> > -#include "main_dispatcher.h"
> > -#include "red_channel.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 98%
> > rename from server/main_dispatcher.h
> > rename to server/main-dispatcher.h
> > index af40093..a1a2e77 100644
> > --- a/server/main_dispatcher.h
> > +++ b/server/main-dispatcher.h
> > @@ -19,7 +19,7 @@
> > #define MAIN_DISPATCHER_H
> >
> > #include <spice.h>
> > -#include "red_channel.h"
> > +#include "red-channel.h"
> >
> > void main_dispatcher_channel_event(int event, SpiceChannelEventInfo
> > *info);
> > void main_dispatcher_seamless_migrate_dst_complete(RedClient *client);
> > 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..b8d320e 100644
> > --- a/server/red_memslots.c
> > +++ b/server/memslot.c
> > @@ -21,8 +21,8 @@
> >
> > #include <inttypes.h>
> >
> > -#include "red_common.h"
> > -#include "red_memslots.h"
> > +#include "red-common.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 96%
> > rename from server/red_memslots.h
> > rename to server/memslot.h
> > index a40050c..0caa627 100644
> > --- a/server/red_memslots.h
> > +++ b/server/memslot.h
> > @@ -16,10 +16,10 @@
> > 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"
> > +#include "red-common.h"
> >
> > #include <spice/qxl_dev.h>
> >
> > @@ -69,4 +69,4 @@ void memslot_info_add_slot(RedMemSlotInfo *info, uint32_t
> > slot_group_id, uint32_
> > void memslot_info_del_slot(RedMemSlotInfo *info, uint32_t slot_group_id,
> > uint32_t slot_id);
> > void memslot_info_reset(RedMemSlotInfo *info);
> >
> > -#endif
> > +#endif /* MEMSLOT_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 5a33cb5..1443687 100644
> > --- a/server/mjpeg_encoder.c
> > +++ b/server/mjpeg-encoder.c
> > @@ -19,8 +19,8 @@
> > #include <config.h>
> > #endif
> >
> > -#include "red_common.h"
> > -#include "mjpeg_encoder.h"
> > +#include "red-common.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 99%
> > rename from server/mjpeg_encoder.h
> > rename to server/mjpeg-encoder.h
> > index d070e70..8223a7f 100644
> > --- a/server/mjpeg_encoder.h
> > +++ b/server/mjpeg-encoder.h
> > @@ -19,7 +19,7 @@
> > #ifndef _H_MJPEG_ENCODER
> > #define _H_MJPEG_ENCODER
> >
> > -#include "red_common.h"
> > +#include "red-common.h"
> >
> > enum {
> > MJPEG_ENCODER_FRAME_UNSUPPORTED = -1,
> > diff --git a/server/pixmap-cache.h b/server/pixmap-cache.h
> > index 039a4a3..66658f3 100644
> > --- a/server/pixmap-cache.h
> > +++ b/server/pixmap-cache.h
> > @@ -18,7 +18,7 @@
> > #ifndef _PIXMAP_CACHE_H
> > # define _PIXMAP_CACHE_H
> >
> > -#include "red_channel.h"
> > +#include "red-channel.h"
> >
> > #define MAX_CACHE_CLIENTS 4
> >
> > diff --git a/server/red_channel.c b/server/red-channel.c
> > similarity index 99%
> > rename from server/red_channel.c
> > rename to server/red-channel.c
> > index 609c83f..2a64bc8 100644
> > --- a/server/red_channel.c
> > +++ b/server/red-channel.c
> > @@ -39,10 +39,10 @@
> > #include "common/ring.h"
> >
> > #include "stat.h"
> > -#include "red_channel.h"
> > +#include "red-channel.h"
> > #include "reds.h"
> > -#include "reds_stream.h"
> > -#include "main_dispatcher.h"
> > +#include "reds-stream.h"
> > +#include "main-dispatcher.h"
> > #include "utils.h"
> >
> > typedef struct EmptyMsgPipeItem {
> > @@ -2036,7 +2036,7 @@ void
> > red_channel_client_pipe_remove_and_release(RedChannelClient *rcc,
> > }
> >
> > /*
> > - * RedClient implementation - kept in red_channel.c because they are
> > + * RedClient implementation - kept in red-channel.c because they are
> > * pretty tied together.
> > */
> >
> > diff --git a/server/red_channel.h b/server/red-channel.h
> > similarity index 99%
> > rename from server/red_channel.h
> > rename to server/red-channel.h
> > index 7f2584a..8369a94 100644
> > --- a/server/red_channel.h
> > +++ b/server/red-channel.h
> > @@ -29,9 +29,9 @@
> > #include "common/marshaller.h"
> >
> > #include "spice.h"
> > -#include "red_common.h"
> > +#include "red-common.h"
> > #include "demarshallers.h"
> > -#include "reds_stream.h"
> > +#include "reds-stream.h"
> > #include "stat.h"
> >
> > #define MAX_SEND_BUFS 1000
> > @@ -529,7 +529,7 @@ void red_channel_client_pipe_clear(RedChannelClient
> > *rcc);
> > // display_channel_wait_for_init
> > // red_wait_outgoing_item
> > // red_wait_pipe_item_sent
> > -// handle_channel_events - this is the only one that was used before, and
> > was in red_channel.c
> > +// handle_channel_events - this is the only one that was used before, and
> > was in red-channel.c
> > void red_channel_receive(RedChannel *channel);
> > void red_channel_client_receive(RedChannelClient *rcc);
> > // For red_worker
> > diff --git a/server/red_common.h b/server/red-common.h
> > similarity index 100%
> > rename from server/red_common.h
> > rename to server/red-common.h
> > diff --git a/server/red_dispatcher.c b/server/red-dispatcher.c
> > similarity index 99%
> > rename from server/red_dispatcher.c
> > rename to server/red-dispatcher.c
> > index a7825f5..47c8179 100644
> > --- a/server/red_dispatcher.c
> > +++ b/server/red-dispatcher.c
> > @@ -31,13 +31,13 @@
> > #include "common/quic.h"
> >
> > #include "spice.h"
> > -#include "red_worker.h"
> > -#include "reds_sw_canvas.h"
> > +#include "red-worker.h"
> > +#include "sw-canvas.h"
> > #include "reds.h"
> > #include "dispatcher.h"
> > -#include "red_parse_qxl.h"
> > +#include "red-parse-qxl.h"
> >
> > -#include "red_dispatcher.h"
> > +#include "red-dispatcher.h"
> >
> > static int num_active_workers = 0;
> >
> > diff --git a/server/red_dispatcher.h b/server/red-dispatcher.h
> > similarity index 99%
> > rename from server/red_dispatcher.h
> > rename to server/red-dispatcher.h
> > index 9f3474f..d9ee0ec 100644
> > --- a/server/red_dispatcher.h
> > +++ b/server/red-dispatcher.h
> > @@ -20,7 +20,7 @@
> >
> > #include <unistd.h>
> > #include <errno.h>
> > -#include "red_channel.h"
> > +#include "red-channel.h"
> >
> > typedef struct RedDispatcher RedDispatcher;
> >
> > diff --git a/server/red_parse_qxl.c b/server/red-parse-qxl.c
> > similarity index 99%
> > rename from server/red_parse_qxl.c
> > rename to server/red-parse-qxl.c
> > index 6e2ca99..5a14b45 100644
> > --- a/server/red_parse_qxl.c
> > +++ b/server/red-parse-qxl.c
> > @@ -24,9 +24,9 @@
> > #include <glib.h>
> > #include "common/lz_common.h"
> > #include "spice-bitmap-utils.h"
> > -#include "red_common.h"
> > -#include "red_memslots.h"
> > -#include "red_parse_qxl.h"
> > +#include "red-common.h"
> > +#include "memslot.h"
> > +#include "red-parse-qxl.h"
> >
> > /* Max size in bytes for any data field used in a QXL command.
> > * This will for example be useful to prevent the guest from saturating
> > the
> > diff --git a/server/red_parse_qxl.h b/server/red-parse-qxl.h
> > similarity index 98%
> > rename from server/red_parse_qxl.h
> > rename to server/red-parse-qxl.h
> > index b3b28e1..8f8d459 100644
> > --- a/server/red_parse_qxl.h
> > +++ b/server/red-parse-qxl.h
> > @@ -20,8 +20,8 @@
> > #define RED_ABI_TRANSLATE_H
> >
> > #include <spice/qxl_dev.h>
> > -#include "red_common.h"
> > -#include "red_memslots.h"
> > +#include "red-common.h"
> > +#include "memslot.h"
> >
> > typedef struct RedDrawable {
> > int refs;
> > diff --git a/server/red_record_qxl.c b/server/red-record-qxl.c
> > similarity index 99%
> > rename from server/red_record_qxl.c
> > rename to server/red-record-qxl.c
> > index 17f17bd..0b966f0 100644
> > --- a/server/red_record_qxl.c
> > +++ b/server/red-record-qxl.c
> > @@ -21,11 +21,11 @@
> >
> > #include <stdbool.h>
> > #include <inttypes.h>
> > -#include "red_worker.h"
> > -#include "red_common.h"
> > -#include "red_memslots.h"
> > -#include "red_parse_qxl.h"
> > -#include "zlib_encoder.h"
> > +#include "red-worker.h"
> > +#include "red-common.h"
> > +#include "memslot.h"
> > +#include "red-parse-qxl.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
> > similarity index 95%
> > rename from server/red_record_qxl.h
> > rename to server/red-record-qxl.h
> > index b737db8..21f0bc9 100644
> > --- a/server/red_record_qxl.h
> > +++ b/server/red-record-qxl.h
> > @@ -20,8 +20,8 @@
> > #define RED_ABI_RECORD_H
> >
> > #include <spice/qxl_dev.h>
> > -#include "red_common.h"
> > -#include "red_memslots.h"
> > +#include "red-common.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
> > similarity index 99%
> > rename from server/red_replay_qxl.c
> > rename to server/red-replay-qxl.c
> > index ad1a8fd..ef7477a 100644
> > --- a/server/red_replay_qxl.c
> > +++ b/server/red-replay-qxl.c
> > @@ -24,11 +24,11 @@
> > #include <zlib.h>
> > #include <pthread.h>
> > #include "reds.h"
> > -#include "red_worker.h"
> > -#include "red_common.h"
> > -#include "red_memslots.h"
> > -#include "red_parse_qxl.h"
> > -#include "red_replay_qxl.h"
> > +#include "red-worker.h"
> > +#include "red-common.h"
> > +#include "memslot.h"
> > +#include "red-parse-qxl.h"
> > +#include "red-replay-qxl.h"
> > #include <glib.h>
> >
> > typedef enum {
> > diff --git a/server/red_replay_qxl.h b/server/red-replay-qxl.h
> > similarity index 100%
> > rename from server/red_replay_qxl.h
> > rename to server/red-replay-qxl.h
> > diff --git a/server/red_worker.c b/server/red-worker.c
> > similarity index 99%
> > rename from server/red_worker.c
> > rename to server/red-worker.c
> > index 9ba57e4..aecfcf9 100644
> > --- a/server/red_worker.c
> > +++ b/server/red-worker.c
> > @@ -48,7 +48,7 @@
> > #include "stream.h"
> >
> > #include "spice.h"
> > -#include "red_worker.h"
> > +#include "red-worker.h"
> > #include "spice_timer_queue.h"
> > #include "cursor-channel.h"
> > #include "tree.h"
> > diff --git a/server/red_worker.h b/server/red-worker.h
> > similarity index 98%
> > rename from server/red_worker.h
> > rename to server/red-worker.h
> > index 755f0c3..710b54c 100644
> > --- a/server/red_worker.h
> > +++ b/server/red-worker.h
> > @@ -21,9 +21,9 @@
> > #include <unistd.h>
> > #include <errno.h>
> > #include "utils.h"
> > -#include "red_common.h"
> > -#include "red_dispatcher.h"
> > -#include "red_parse_qxl.h"
> > +#include "red-common.h"
> > +#include "red-dispatcher.h"
> > +#include "red-parse-qxl.h"
> >
> > typedef struct RedWorker RedWorker;
> >
> > diff --git a/server/reds_stream.c b/server/reds-stream.c
> > similarity index 99%
> > rename from server/reds_stream.c
> > rename to server/reds-stream.c
> > index 3b47391..f5244e2 100644
> > --- a/server/reds_stream.c
> > +++ b/server/reds-stream.c
> > @@ -19,9 +19,9 @@
> > #include <config.h>
> > #endif
> >
> > -#include "main_dispatcher.h"
> > -#include "red_common.h"
> > -#include "reds_stream.h"
> > +#include "main-dispatcher.h"
> > +#include "red-common.h"
> > +#include "reds-stream.h"
> > #include "common/log.h"
> >
> > #include <errno.h>
> > diff --git a/server/reds_stream.h b/server/reds-stream.h
> > similarity index 100%
> > rename from server/reds_stream.h
> > rename to server/reds-stream.h
> > diff --git a/server/reds.c b/server/reds.c
> > index 8b3c3cb..7bdf6a6 100644
> > --- a/server/reds.c
> > +++ b/server/reds.c
> > @@ -56,20 +56,20 @@
> > #include "spice.h"
> > #include "reds.h"
> > #include "agent-msg-filter.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 "inputs-channel.h"
> > +#include "main-channel.h"
> > +#include "red-common.h"
> > +#include "red-dispatcher.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
> > -#include "reds_stream.h"
> > +#include "reds-stream.h"
> >
> > #include "reds-private.h"
> >
> > diff --git a/server/reds.h b/server/reds.h
> > index fcdc5eb..4d1b631 100644
> > --- a/server/reds.h
> > +++ b/server/reds.h
> > @@ -27,8 +27,8 @@
> > #include "common/marshaller.h"
> > #include "common/messages.h"
> > #include "spice.h"
> > -#include "red_channel.h"
> > -#include "migration_protocol.h"
> > +#include "red-channel.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/smartcard.c b/server/smartcard.c
> > index a2bba89..39f1391 100644
> > --- a/server/smartcard.c
> > +++ b/server/smartcard.c
> > @@ -29,10 +29,10 @@
> > #endif
> >
> > #include "reds.h"
> > -#include "char_device.h"
> > -#include "red_channel.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..2d3f393 100644
> > --- a/server/snd_worker.c
> > +++ b/server/sound.c
> > @@ -30,11 +30,11 @@
> > #include "common/generated_server_marshallers.h"
> >
> > #include "spice.h"
> > -#include "red_common.h"
> > -#include "main_channel.h"
> > +#include "red-common.h"
> > +#include "main-channel.h"
> > #include "reds.h"
> > -#include "red_dispatcher.h"
> > -#include "snd_worker.h"
> > +#include "red-dispatcher.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/spice_timer_queue.c b/server/spice_timer_queue.c
> > index c4f2f6e..60017cc 100644
> > --- a/server/spice_timer_queue.c
> > +++ b/server/spice_timer_queue.c
> > @@ -17,7 +17,7 @@
> > */
> > #include <config.h>
> > #include <pthread.h>
> > -#include "red_common.h"
> > +#include "red-common.h"
> > #include "spice_timer_queue.h"
> > #include "common/ring.h"
> >
> > diff --git a/server/spicevmc.c b/server/spicevmc.c
> > index d37b1ec..23a81f0 100644
> > --- a/server/spicevmc.c
> > +++ b/server/spicevmc.c
> > @@ -30,10 +30,10 @@
> >
> > #include "common/generated_server_marshallers.h"
> >
> > -#include "char_device.h"
> > -#include "red_channel.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..3a30172 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 "red-channel.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 92%
> > rename from server/reds_sw_canvas.h
> > rename to server/sw-canvas.h
> > index 96a4c0c..2a037c2 100644
> > --- a/server/reds_sw_canvas.h
> > +++ b/server/sw-canvas.h
> > @@ -14,11 +14,11 @@
> > 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"
> > #undef SW_CANVAS_IMAGE_CACHE
> >
> > -#endif
> > +#endif /* SW_CANVAS_H_ */
> > diff --git a/server/tests/replay.c b/server/tests/replay.c
> > index 1d1f1bb..ef6c7fb 100644
> > --- a/server/tests/replay.c
> > +++ b/server/tests/replay.c
> > @@ -36,7 +36,7 @@
> > #include <pthread.h>
> >
> > #include <spice/macros.h>
> > -#include "red_replay_qxl.h"
> > +#include "red-replay-qxl.h"
> > #include "test_display_base.h"
> > #include "common/log.h"
> >
> > diff --git a/server/tests/test_display_base.c
> > b/server/tests/test_display_base.c
> > index c2c5705..8c8cef1 100644
> > --- a/server/tests/test_display_base.c
> > +++ b/server/tests/test_display_base.c
> > @@ -31,7 +31,7 @@
> > #include <spice/qxl_dev.h>
> >
> > #include "test_display_base.h"
> > -#include "red_channel.h"
> > +#include "red-channel.h"
> > #include "test_util.h"
> >
> > #ifndef PATH_MAX
> > diff --git a/server/tree.c b/server/tree.c
> > index a3dfbde..e5e3c76 100644
> > --- a/server/tree.c
> > +++ b/server/tree.c
> > @@ -19,7 +19,7 @@
> > #endif
> >
> > #include <spice/qxl_dev.h>
> > -#include "red_parse_qxl.h"
> > +#include "red-parse-qxl.h"
> > #include "display-channel.h"
> >
> > #include "tree.h"
> > diff --git a/server/zlib_encoder.c b/server/zlib-encoder.c
> > similarity index 98%
> > rename from server/zlib_encoder.c
> > rename to server/zlib-encoder.c
> > index a3d2aa6..96a7b54 100644
> > --- a/server/zlib_encoder.c
> > +++ b/server/zlib-encoder.c
> > @@ -19,8 +19,8 @@
> > #include <config.h>
> > #endif
> >
> > -#include "red_common.h"
> > -#include "zlib_encoder.h"
> > +#include "red-common.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
>
>
> Acked-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
>
Merged
Frediano
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel