summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2012-02-14 09:57:55 -0600
committerAlon Levy <alevy@redhat.com>2012-02-14 18:19:43 +0200
commit3f303d6014a53d2250aeb8c86aa5038f98f2e83c (patch)
tree59aaba327ac36dba4b0367cced9ee577a46e37ca /server
parent08c514ee853444ab158aa461b07b1921bb931a29 (diff)
downloadspice-3f303d6014a53d2250aeb8c86aa5038f98f2e83c.tar.gz
spice-3f303d6014a53d2250aeb8c86aa5038f98f2e83c.tar.xz
spice-3f303d6014a53d2250aeb8c86aa5038f98f2e83c.zip
Remove all usages of bzero()
As recommended by modern C practice, we should just be using memset(). Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Diffstat (limited to 'server')
-rw-r--r--server/tests/basic_event_loop.c2
-rw-r--r--server/tests/test_display_base.c6
-rw-r--r--server/tests/test_empty_success.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/server/tests/basic_event_loop.c b/server/tests/basic_event_loop.c
index c0ee705c..70eb0269 100644
--- a/server/tests/basic_event_loop.c
+++ b/server/tests/basic_event_loop.c
@@ -267,7 +267,7 @@ SpiceCoreInterface *basic_event_loop_init(void)
{
ring_init(&watches);
ring_init(&timers);
- bzero(&core, sizeof(core));
+ memset(&core, 0, sizeof(core));
core.base.major_version = SPICE_INTERFACE_CORE_MAJOR;
core.base.minor_version = SPICE_INTERFACE_CORE_MINOR; // anything less then 3 and channel_event isn't called
core.timer_add = timer_add;
diff --git a/server/tests/test_display_base.c b/server/tests/test_display_base.c
index 811e901b..63cbf2f8 100644
--- a/server/tests/test_display_base.c
+++ b/server/tests/test_display_base.c
@@ -339,7 +339,7 @@ static void set_mm_time(QXLInstance *qin, uint32_t mm_time)
static void get_init_info(QXLInstance *qin, QXLDevInitInfo *info)
{
- bzero(info, sizeof(*info));
+ memset(info, 0, sizeof(*info));
info->num_memslots = 1;
info->num_memslots_groups = 1;
info->memslot_id_bits = 1;
@@ -644,8 +644,8 @@ SpiceServer* test_init(SpiceCoreInterface *core)
spice_server_init(server, core);
path_init(&path, 0, angle_parts);
- bzero(primary_surface, sizeof(primary_surface));
- bzero(secondary_surface, sizeof(secondary_surface));
+ memset(primary_surface, 0, sizeof(primary_surface));
+ memset(secondary_surface, 0, sizeof(secondary_surface));
has_secondary = 0;
wakeup_timer = core->timer_add(do_wakeup, NULL);
return server;
diff --git a/server/tests/test_empty_success.c b/server/tests/test_empty_success.c
index 435efbf6..ccabe6b4 100644
--- a/server/tests/test_empty_success.c
+++ b/server/tests/test_empty_success.c
@@ -1,6 +1,6 @@
#include <config.h>
#include <stdlib.h>
-#include <strings.h>
+#include <string.h>
#include <spice.h>
@@ -43,7 +43,7 @@ int main(void)
SpiceServer *server = spice_server_new();
SpiceCoreInterface core;
- bzero(&core, sizeof(core));
+ memset(&core, 0, sizeof(core));
core.base.major_version = SPICE_INTERFACE_CORE_MAJOR;
core.timer_add = timer_add;
core.timer_start = timer_start;