[Playerstage-commit] code/player/client_libs/libplayerc client.c, 1.74, 1.75

[Brian G. <ge...@us...>]

Update of /cvsroot/playerstage/code/player/client_libs/libplayerc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24167/client_libs/libplayerc

Modified Files:
	client.c 
Log Message:
applied patch 1654805

Index: client.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/client.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** client.c	19 Dec 2006 17:41:27 -0000	1.74
--- client.c	27 Feb 2007 18:09:20 -0000	1.75
***************
*** 573,581 ****
          client->datatime = header.timestamp;
          if (client->mode == PLAYER_DATAMODE_PUSH)
            // If in push mode, handle and return
!           return playerc_client_dispatch (client, &header, client->data);
          else  // PULL mode, so keep on going
          {
!           if (playerc_client_dispatch (client, &header, client->data) == NULL)
              return NULL;
            continue;
--- 573,588 ----
          client->datatime = header.timestamp;
          if (client->mode == PLAYER_DATAMODE_PUSH)
+         {
            // If in push mode, handle and return
!           void *result = playerc_client_dispatch (client, &header, client->data);
!           // Need to ensure that any dynamic data made during unpacking is cleaned up
!           playerxdr_delete_message(client->data, header.addr.interf, header.type, header.subtype);
!           return result;
!         }
          else  // PULL mode, so keep on going
          {
!           void *result = playerc_client_dispatch (client, &header, client->data);
!           playerxdr_delete_message(client->data, header.addr.interf, header.type, header.subtype);
!           if (result == NULL)
              return NULL;
            continue;
***************
*** 985,989 ****
  
    // Locate the appropriate unpacking function for the message body
!   if(!(packfunc = playerxdr_get_func(header->addr.interf, header->type,
                                       header->subtype)))
    {
--- 992,996 ----
  
    // Locate the appropriate unpacking function for the message body
!   if(!(packfunc = playerxdr_get_packfunc(header->addr.interf, header->type,
                                       header->subtype)))
    {
***************
*** 1036,1040 ****
    {
      // Locate the appropriate packing function for the message body
!     if(!(packfunc = playerxdr_get_func(header->addr.interf,
                                         header->type,
                                         header->subtype)))
--- 1043,1047 ----
    {
      // Locate the appropriate packing function for the message body
!     if(!(packfunc = playerxdr_get_packfunc(header->addr.interf,
                                         header->type,
                                         header->subtype)))