Update of /cvsroot/playerstage/code/player/libplayerxdr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20455/libplayerxdr
Modified Files:
playerxdrgen.py
Log Message:
added vectormap interface
added postgis vectormap driver
Thanks to Ben Morelli for these changes
Index: playerxdrgen.py
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayerxdr/playerxdrgen.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** playerxdrgen.py 20 Aug 2007 06:37:26 -0000 1.11
--- playerxdrgen.py 20 Aug 2007 19:42:48 -0000 1.12
***************
*** 167,171 ****
sourcefile.write('unsigned int\n' + typename + '_dpcpy(const ' +
typename + '* src, ' + typename + '* dest)\n{\n')
#sourcefile.write(' printf ("' + typename + '_dpcpy starting\\n");
fflush(NULL);\n')
! sourcefile.write(' if(src == NULL)\n return(0);\n')
sourcefile.write(' unsigned int size = 0;\n')
else:
--- 167,171 ----
sourcefile.write('unsigned int\n' + typename + '_dpcpy(const ' +
typename + '* src, ' + typename + '* dest)\n{\n')
#sourcefile.write(' printf ("' + typename + '_dpcpy starting\\n");
fflush(NULL);\n')
! sourcefile.write(' unsigned ii;\nif(src == NULL)\n return(0);\n')
sourcefile.write(' unsigned int size = 0;\n')
else:
***************
*** 177,181 ****
sourcefile.write('void\n' + typename + '_cleanup(' + typename + '*
msg)\n{\n')
#sourcefile.write(' printf("' + typename + '_cleanup starting\\n");
fflush(NULL);\n')
! sourcefile.write(' if(msg == NULL)\n return;\n')
varlist = []
--- 177,181 ----
sourcefile.write('void\n' + typename + '_cleanup(' + typename + '*
msg)\n{\n')
#sourcefile.write(' printf("' + typename + '_cleanup starting\\n");
fflush(NULL);\n')
! sourcefile.write(' unsigned ii;\nif(msg == NULL)\n return;\n')
varlist = []
***************
*** 294,305 ****
sourcefile.write(' else\n dest->' + varstring + ' =
NULL;\n')
if typestring in hasdynamic: # Need to deep copy embedded
structures
! sourcefile.write(' for(int ii = 0; ii < src->' + countvar
+ '; ii++)\n {\n')
sourcefile.write(' size += ' + typestring +
'_dpcpy(&(src->' + varstring + '[ii]), &(dest->' + varstring + '[ii]));\n }\n')
elif i == 3:
sourcefile.write(' if(msg->' + varstring + ' == NULL)\n
return;\n')
- sourcefile.write(' free(msg->' + varstring + ');\n')
if typestring in hasdynamic: # Need to clean up embedded
structures
! sourcefile.write(' for(int ii = 0; ii < msg->' + countvar
+ '; ii++)\n {\n')
sourcefile.write(' ' + typestring + '_cleanup(&(msg->' +
varstring + '[ii]));\n }\n')
else: # Handle a static array
# Was a _count variable declared? If so, we'll encode as a
--- 294,305 ----
sourcefile.write(' else\n dest->' + varstring + ' =
NULL;\n')
if typestring in hasdynamic: # Need to deep copy embedded
structures
! sourcefile.write(' for(ii = 0; ii < src->' + countvar + ';
ii++)\n {\n')
sourcefile.write(' size += ' + typestring +
'_dpcpy(&(src->' + varstring + '[ii]), &(dest->' + varstring + '[ii]));\n }\n')
elif i == 3:
sourcefile.write(' if(msg->' + varstring + ' == NULL)\n
return;\n')
if typestring in hasdynamic: # Need to clean up embedded
structures
! sourcefile.write(' for(ii = 0; ii < msg->' + countvar + ';
ii++)\n {\n')
sourcefile.write(' ' + typestring + '_cleanup(&(msg->' +
varstring + '[ii]));\n }\n')
+ sourcefile.write(' free(msg->' + varstring + ');\n')
else: # Handle a static array
# Was a _count variable declared? If so, we'll encode as a
***************
*** 352,359 ****
if typestring in hasdynamic: # Need to deep copy/clean
up embedded structures
if i == 2:
! sourcefile.write(' for(int ii = 0; ii < src->' +
countvar + '; ii++)\n {\n')
sourcefile.write(' size += ' + typestring +
'_dpcpy(&(src->' + varstring + '[ii]), &(dest->' + varstring + '[ii]));\n }\n')
elif i == 3:
! sourcefile.write(' for(int ii = 0; ii < msg->' +
countvar + '; ii++)\n {\n')
sourcefile.write(' ' + typestring +
'_cleanup(&(msg->' + varstring + '[ii]));\n }\n')
else:
--- 352,359 ----
if typestring in hasdynamic: # Need to deep copy/clean
up embedded structures
if i == 2:
! sourcefile.write(' for(ii = 0; ii < src->' + countvar
+ '; ii++)\n {\n')
sourcefile.write(' size += ' + typestring +
'_dpcpy(&(src->' + varstring + '[ii]), &(dest->' + varstring + '[ii]));\n }\n')
elif i == 3:
! sourcefile.write(' for(ii = 0; ii < msg->' + countvar
+ '; ii++)\n {\n')
sourcefile.write(' ' + typestring +
'_cleanup(&(msg->' + varstring + '[ii]));\n }\n')
else:
***************
*** 381,388 ****
if typestring in hasdynamic: # Need to deep copy/clean
up embedded structures
if i == 2:
! sourcefile.write(' for(int ii = 0; ii < ' + arraysize
+ '; ii++)\n {\n')
sourcefile.write(' size += ' + typestring +
'_dpcpy(&(src->' + varstring + '[ii]), &(dest->' + varstring + '[ii]));\n }\n')
elif i == 3:
! sourcefile.write(' for(int ii = 0; ii < ' + arraysize
+ '; ii++)\n {\n')
sourcefile.write(' ' + typestring +
'_cleanup(&(msg->' + varstring + '[ii]_);\n }\n')
else:
--- 381,388 ----
if typestring in hasdynamic: # Need to deep copy/clean
up embedded structures
if i == 2:
! sourcefile.write(' for(ii = 0; ii < ' + arraysize + ';
ii++)\n {\n')
sourcefile.write(' size += ' + typestring +
'_dpcpy(&(src->' + varstring + '[ii]), &(dest->' + varstring + '[ii]));\n }\n')
elif i == 3:
! sourcefile.write(' for(ii = 0; ii < ' + arraysize + ';
ii++)\n {\n')
sourcefile.write(' ' + typestring +
'_cleanup(&(msg->' + varstring + '[ii]_);\n }\n')
else:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit