[Pkg-telepathy-commits] [libnice] 116/265: tests: Fix a shadowed function name in test-pseudotcp

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit 9661150dcda7939d108e583e7681352f99e581c8
Author: Philip Withnall <philip.withnall at collabora.co.uk>
Date:   Thu Jan 16 16:05:12 2014 +0000

    tests: Fix a shadowed function name in test-pseudotcp
    
    The write() function already exists; we can’t re-define it as a
    callback.
---
 tests/test-pseudotcp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/test-pseudotcp.c b/tests/test-pseudotcp.c
index 84f5c9b..642c18e 100644
--- a/tests/test-pseudotcp.c
+++ b/tests/test-pseudotcp.c
@@ -177,7 +177,7 @@ static gboolean notify_packet (gpointer user_data)
   return FALSE;
 }
 
-static PseudoTcpWriteResult write (PseudoTcpSocket *sock,
+static PseudoTcpWriteResult write_packet (PseudoTcpSocket *sock,
     const gchar *buffer, guint32 len, gpointer user_data)
 {
   struct notify_data *data;
@@ -247,7 +247,9 @@ static void adjust_clock (PseudoTcpSocket *sock)
 
 int main (int argc, char *argv[])
 {
-  PseudoTcpCallbacks cbs = {NULL, opened, readable, writable, closed, write};
+  PseudoTcpCallbacks cbs = {
+    NULL, opened, readable, writable, closed, write_packet
+  };
 
   mainloop = g_main_loop_new (NULL, FALSE);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git