Menu
▾
▴
syncml-ctoolkit-cvs — Notification of any CVS changes to the toolkit.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(19) |
May
(23) |
Jun
(24) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Kidong L. <bri...@us...> - 2004-06-12 04:14:36
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/wsm/palm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17386/sml/wsm/palm Modified Files: wsm_sm.c Log Message: Added files to build on PalmOS/prc-tools Fixed compilation errors on PalmOS/prc-tools Index: wsm_sm.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/wsm/palm/wsm_sm.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wsm_sm.c 24 May 2004 01:33:38 -0000 1.3 --- wsm_sm.c 12 Jun 2004 04:14:27 -0000 1.4 *************** *** 55,59 **** #include <smldef.h> #include <smlerr.h> ! #include <Pilot.h> #include "wsm_sm.h" --- 55,59 ---- #include <smldef.h> #include <smlerr.h> ! #include <PalmOS.h> #include "wsm_sm.h" *************** *** 99,103 **** // create memory ! if ( (smPalmH=(Handle)MemHandleNew(memSize)) == 0 ) { return SML_ERR_NOT_ENOUGH_SPACE; } --- 99,103 ---- // create memory ! if ( (smPalmH=MemHandleNew(memSize)) == 0 ) { return SML_ERR_NOT_ENOUGH_SPACE; } *************** *** 122,126 **** // reset handle ! if ( (ret=MemHandleFree((VoidHand)smPalmH)) != 0 ) { return SML_ERR_WRONG_USAGE; } --- 122,126 ---- // reset handle ! if ( (ret=MemHandleFree(smPalmH)) != 0 ) { return SML_ERR_WRONG_USAGE; } *************** *** 147,151 **** } ! if ( (*pMem = MemHandleLock((VoidHand)smPalmH)) == NULL ) { return SML_ERR_UNSPECIFIC; } --- 147,151 ---- } ! if ( (*pMem = MemHandleLock(smPalmH)) == NULL ) { return SML_ERR_UNSPECIFIC; } *************** *** 165,169 **** } ! if ( MemHandleUnlock((VoidHand)smPalmH) != 0 ) { return SML_ERR_UNSPECIFIC; } --- 165,169 ---- } ! if ( MemHandleUnlock(smPalmH) != 0 ) { return SML_ERR_UNSPECIFIC; } *************** *** 187,191 **** } ! if ( (ret=MemHandleResize((VoidHand)smPalmH, newSize)) != 0 ) { return SML_ERR_NOT_ENOUGH_SPACE; } --- 187,191 ---- } ! if ( (ret=MemHandleResize(smPalmH, newSize)) != 0 ) { return SML_ERR_NOT_ENOUGH_SPACE; } *************** *** 201,205 **** } ! *actSize = MemHandleSize((VoidHand)smPalmH); return SML_ERR_OK; } --- 201,205 ---- } ! *actSize = MemHandleSize(smPalmH); return SML_ERR_OK; } |
|
From: Kidong L. <bri...@us...> - 2004-06-12 04:14:36
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/lib/all In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17386/sml/lib/all Modified Files: libutil.c Log Message: Added files to build on PalmOS/prc-tools Fixed compilation errors on PalmOS/prc-tools Index: libutil.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/lib/all/libutil.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** libutil.c 24 May 2004 01:33:35 -0000 1.3 --- libutil.c 12 Jun 2004 04:14:26 -0000 1.4 *************** *** 68,72 **** #ifdef __PALM_OS__ ! #include <Pilot.h> #include <unix_stdarg.h> #endif --- 68,72 ---- #ifdef __PALM_OS__ ! #include <PalmOS.h> #include <unix_stdarg.h> #endif |
|
From: Kidong L. <bri...@us...> - 2004-06-12 04:14:34
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/bld/palm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17386/bld/palm Added Files: Makefile Makefile.xpt Log Message: Added files to build on PalmOS/prc-tools Fixed compilation errors on PalmOS/prc-tools --- NEW FILE: Makefile --- # # Copyright Notice # Copyright (c) Ericsson, IBM, Lotus, Matsushita Communication # Industrial Co., Ltd., Motorola, Nokia, Openwave Systems, Inc., # Palm, Inc., Psion, Starfish Software, Symbian, Ltd. (2001). # All Rights Reserved. # Implementation of all or part of any Specification may require # licenses under third party intellectual property rights, # including without limitation, patent rights (such a third party # may or may not be a Supporter). The Sponsors of the Specification # are not responsible and shall not be held responsible in any # manner for identifying or failing to identify any or all such # third party intellectual property rights. # # THIS DOCUMENT AND THE INFORMATION CONTAINED HEREIN ARE PROVIDED # ON AN "AS IS" BASIS WITHOUT WARRANTY OF ANY KIND AND ERICSSON, IBM, # LOTUS, MATSUSHITA COMMUNICATION INDUSTRIAL CO. LTD, MOTOROLA, # NOKIA, PALM INC., PSION, STARFISH SOFTWARE AND ALL OTHER SYNCML # SPONSORS DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING # BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION # HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF # MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT # SHALL ERICSSON, IBM, LOTUS, MATSUSHITA COMMUNICATION INDUSTRIAL CO., # LTD, MOTOROLA, NOKIA, PALM INC., PSION, STARFISH SOFTWARE OR ANY # OTHER SYNCML SPONSOR BE LIABLE TO ANY PARTY FOR ANY LOSS OF # PROFITS, LOSS OF BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF # BUSINESS, OR FOR DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, # PUNITIVE OR CONSEQUENTIAL DAMAGES OF ANY KIND IN CONNECTION WITH # THIS DOCUMENT OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED # OF THE POSSIBILITY OF SUCH LOSS OR DAMAGE. # # The above notice and this paragraph must be included on all copies # of this document that are made. # # # delete files RM = rm -f # compiler to use CC = m68k-palmos-gcc # some flags CFLAGS = -g -Wall # # Various targets to build. # BIN = ../../../bin/palm SML_NAME = $(BIN)/libsml.so # # where to find the includes and objects # SRC = ../../sml INCS = -I$(SRC)/.. \ -I$(SRC)/inc \ -I$(SRC)/inc/palm \ -I$(SRC)/lib/inc \ -I$(SRC)/mgr/inc \ -I$(SRC)/wsm/inc \ -I$(SRC)/xlt/all \ -I$(SRC)/xlt/inc VPATH = ../.. \ $(SRC)/inc \ $(SRC)/inc/palm \ $(SRC)/lib/inc \ $(SRC)/lib/all \ $(SRC)/mgr/inc \ $(SRC)/mgr/all \ $(SRC)/mgr/palm \ $(SRC)/wsm/inc \ $(SRC)/wsm/all \ $(SRC)/wsm/palm \ $(SRC)/xlt/inc \ $(SRC)/xlt/all # # all objects for the shared object # SML_OBJS = libstr.o \ libutil.o \ libmem.o \ mgr.o \ mgrcmdbuilder.o \ mgrcmddispatcher.o \ mgrinstancelist.o \ mgrinstancemgr.o \ mgrutil.o \ wsm.o \ wsm_sm.o \ xlttags.o \ xltdec.o \ xltdecwbxml.o \ xltdecxml.o \ xltutilstack.o \ xltenc.o \ xltencwbxml.o \ xltencxml.o \ xltenccom.o \ xltmetinf.o \ xltdevinf.o # # create shared object # $(SML_NAME) : $(SML_OBJS) @mkdir -p $(BIN) m68k-palmos-ld $(SML_OBJS) -o $(SML_NAME) @echo SML build done. # # dependencies # libstr.o : smldef.h define.h libstr.h libmem.h libmem.o : smldef.h libutil.o : smldef.h define.h smlerr.h sml.h libmem.h libutil.h \ mgr.h smldtd.h wsm.h wsm_sm.h mgr.o : smldef.h define.h sml.h smldtd.h smlerr.h libmem.h \ wsm.h wsm_sm.h mgr.h mgrcmdbuilder.o : smldef.h define.h xltenc.h smlerr.h xltenccom.h \ smldtd.h mgr.h sml.h wsm.h wsm_sm.h mgrcmddispatcher.o : smldef.h define.h smldtd.h smlerr.h libmem.h sml.h \ libutil.h xltdec.h mgr.h wsm.h wsm_sm.h mgrinstancelist.o : smlerr.h libmem.h smldef.h define.h mgr.h sml.h \ smldtd.h wsm.h wsm_sm.h mgrinstancemgr.o : smldef.h define.h sml.h smldtd.h smlerr.h libmem.h \ wsm.h wsm_sm.h mgr.h mgrutil.o : smldef.h sml.h smldtd.h smlerr.h define.h\ smlmetinfdtd.h wsm.o : wsm.h smlerr.h define.h libutil.h wsm_sm.h sml.h \ smldtd.h smldef.h libmem.h libstr.h mgr.h wsm_sm.o : wsm_sm.h smldef.h define.h libutil.h smlerr.h \ mgr.h sml.h smldtd.h wsm.h xlttags.o : xlttags.h smlerr.h libmem.h libutil.h libstr.h xltdec.o : xlttags.h define.h smldtd.h smlerr.h xltdec.h \ xltdeccom.h xltutilstack.h smldef.h libutil.h \ libmem.h libstr.h xlttagtbl.h xltmetinf.h xltdecwbxml.o : xlttags.h define.h smldtd.h smlerr.h xltdeccom.h \ xltutilstack.h smldef.h libutil.h libmem.h libstr.h xltdecxml.o : xltdeccom.h smldef.h define.h smldtd.h xlttags.h \ libutil.h libmem.h libstr.h smlerr.h xltutilstack.o : xltdeccom.h smldef.h define.h smldtd.h xlttags.h \ libutil.h xltutilstack.h smlerr.h libmem.h xltenc.o : xltenc.h smlerr.h xltenccom.h smldef.h define.h \ smldtd.h xltencwbxml.h xlttags.h xltencxml.h \ libstr.h libmem.h libutil.h smlmetinfdtd.h xltmetinf.h\ xlttagtbl.h xltencwbxml.o : xltencwbxml.h smlerr.h smldef.h define.h smldtd.h \ xlttags.h xltenccom.h libmem.h libstr.h libutil.h xltencxml.o : xltencxml.h smlerr.h xlttags.h smldtd.h smldef.h \ define.h xltenccom.h libstr.h libmem.h libutil.h xltenccom.o : xltenccom.h smldef.h define.h smlerr.h libmem.h \ libutil.h xltmetinf.o : smldef.h smldtd.h smlerr.h smlmetinfdtd.h define.h\ libmem.h libstr.h libutil.h xltdeccom.h xltmetinf.h\ xlttags.h xlttagtbl.h xltdec.h xltenc.h xltdevinf.o : smldevinfdtd.h xlttags.h xlttagtbl.h xltenc.h \ xltenc.h xltencwbxml.h libstr.h smlerr.h smldtd.h\ libmem.h libutil.h ## # default rule for compiling files # .c.o: $(CC) -c $(CFLAGS) $(INCS) -o $@ $< .PHONY: all sml xpt clean # # targets # all : sml xpt sml : $(SML_NAME) xpt : sml @$(MAKE) -f Makefile.xpt --no-print-directory clean : . @$(RM) *.o @$(MAKE) -f Makefile.xpt --no-print-directory clean --- NEW FILE: Makefile.xpt --- # # Copyright Notice # Copyright (c) Ericsson, IBM, Lotus, Matsushita Communication # Industrial Co., Ltd., Motorola, Nokia, Openwave Systems, Inc., # Palm, Inc., Psion, Starfish Software, Symbian, Ltd. (2001). # All Rights Reserved. # Implementation of all or part of any Specification may require # licenses under third party intellectual property rights, # including without limitation, patent rights (such a third party # may or may not be a Supporter). The Sponsors of the Specification # are not responsible and shall not be held responsible in any # manner for identifying or failing to identify any or all such # third party intellectual property rights. # # THIS DOCUMENT AND THE INFORMATION CONTAINED HEREIN ARE PROVIDED # ON AN "AS IS" BASIS WITHOUT WARRANTY OF ANY KIND AND ERICSSON, IBM, # LOTUS, MATSUSHITA COMMUNICATION INDUSTRIAL CO. LTD, MOTOROLA, # NOKIA, PALM INC., PSION, STARFISH SOFTWARE AND ALL OTHER SYNCML # SPONSORS DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING # BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION # HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF # MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT # SHALL ERICSSON, IBM, LOTUS, MATSUSHITA COMMUNICATION INDUSTRIAL CO., # LTD, MOTOROLA, NOKIA, PALM INC., PSION, STARFISH SOFTWARE OR ANY # OTHER SYNCML SPONSOR BE LIABLE TO ANY PARTY FOR ANY LOSS OF # PROFITS, LOSS OF BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF # BUSINESS, OR FOR DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, # PUNITIVE OR CONSEQUENTIAL DAMAGES OF ANY KIND IN CONNECTION WITH # THIS DOCUMENT OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED # OF THE POSSIBILITY OF SUCH LOSS OR DAMAGE. # # The above notice and this paragraph must be included on all copies # of this document that are made. # # # Build the xpt components of the SyncML Toolkit SRC = ../.. BIN = ../../../bin/palm MAKEOPTS = -f Makefile.xpt --no-print-directory # compiler to use CC = gcc # Flags that apply to everything built by this Makefile ALL_CFLAGS = -g -fPIC -DTRACE -Wall # Add -DTRACE_TO_STDOUT to the above options to send debugging output directly # to the screen instead of to smlLibPrint(). #-------------------------------------------------- # Flags that apply to the libxpt.so XPT_DLL_CFLAGS = -DBUILDING_XPT # The sml library isn't needed if -DTRACE_TO_STDOUT is specified as a compiler # option, which makes libxpt.so easier to test as a standalone entity. XPT_DLL_LIBS = -ldl -lsml XPT_DLL_SRCPATH = $(SRC)/xpt/manager/all $(SRC)/xpt/manager/palm \ $(SRC)/xpt/manager/inc $(SRC)/sml/inc \ $(SRC)/sml/inc/palm $(SRC)/sml/lib/inc $(SRC) XPT_DLL_OFILES = xptcomm.o utilities.o # For other DLLs that want to include headers from libxpt.so XPT_INCLUDE_DIRS = $(SRC)/xpt/manager/inc $(SRC)/xpt/manager/palm $(SRC)/sml/inc \ $(SRC)/sml/inc/palm $(SRC)/sml/lib/inc #-------------------------------------------------- # Flags that apply to the libxpthttp.so HTTP_DLL_SRCPATH = $(SRC)/xpt/bindings/http/palm $(SRC)/xpt/bindings/http/all \ $(SRC)/xpt/bindings/common/palm $(SRC)/xpt/bindings/common/all \ $(SRC)/xpt/bindings/common/tcp/palm $(SRC)/xpt/bindings/common/tcp/all \ $(XPT_INCLUDE_DIRS) $(SRC) HTTP_DLL_OFILES = xpt-http.o httpserverports.o httptrans.o \ xpt-auth.o digcalc.o xpt-b64.o md5.o xpt-tcp.o \ xptmutex.o HTTP_DLL_LIBS = -lxpt #-------------------------------------------------- # Flags that apply to the libxptwsp.so WSP_DLL_SRCPATH = $(SRC)/xpt/bindings/wsp/palm $(SRC)/xpt/bindings/wsp/all \ $(SRC)/xpt/bindings/wsp/inc \ $(XPT_INCLUDE_DIRS) $(SRC) WSP_DLL_OFILES = protocol.o xpt-wsp.o wspcbk.o wsphttp.o transact.o session.o \ settings.o wsputil.o WSP_DLL_LIBS = -lxpt -lxptawsp # The WSP binding is really supposed to be linked against an actual WAP stack. # Until we have one, link it against a skeleton stack. #----- # Flags that apply to the libawsp.so, a test-only skeleton WAP stack DLL AWSP_DLL_SRCPATH = $(SRC)/xpt/bindings/wsp/awsp/all \ $(SRC)/xpt/bindings/wsp/inc \ $(XPT_INCLUDE_DIRS) AWSP_DLL_OFILES = awsp.o AWSP_DLL_LIBS = -lxpt #-------------------------------------------------- # Flags that apply to the libiobex.so, a general Obex library used by libxptobex.so IOBEX_DLL_SRCPATH = $(SRC)/xpt/bindings/obex/smlobex $(SRC) \ $(SRC)/xpt/bindings/common/tcp/palm \ $(SRC)/xpt/bindings/common/tcp/all IOBEX_DLL_OFILES = debug.o handle.o header.o inetTransport.o irTransport.o \ obex.o object.o transport.o utils.o buffer.o #-------------------------------------------------- # Flags that apply to the libxptobex.so OBEX_DLL_SRCPATH = $(SRC)/xpt/bindings/obex/palm \ $(SRC)/xpt/bindings/obex/smlobex \ $(XPT_INCLUDE_DIRS) $(SRC) OBEX_DLL_OFILES = obexbinding.o OBEX_DLL_LIBS = -liobex -lxpt #-------------------------------------------------- ifdef TARGET # Assign the actual variables, depending on what target we're building CFLAGS = $(ALL_CFLAGS) $($(TARGET)_CFLAGS) $($(TARGET)_SRCPATH:%=-I%) LDLIBS = $($(TARGET)_LIBS) VPATH = $($(TARGET)_SRCPATH) OFILES = $($(TARGET)_OFILES) endif # All shared objects in this Makefile are built with the same basic options. LDFLAGS = -shared -g -L$(BIN) # Declare pseudo-targets, targets that don't exist as files .PHONY: all clean # Cause files partially created by failing commands to be erased: .DELETE_ON_ERROR: # Rules all: # Create the bin dirs if they don't already exist. @-mkdir -p $(BIN) @$(MAKE) $(MAKEOPTS) $(BIN)/libxpt.so TARGET=XPT_DLL @$(MAKE) $(MAKEOPTS) $(BIN)/libxpthttp.so TARGET=HTTP_DLL @$(MAKE) $(MAKEOPTS) $(BIN)/libxptawsp.so TARGET=AWSP_DLL @$(MAKE) $(MAKEOPTS) $(BIN)/libxptwsp.so TARGET=WSP_DLL @$(MAKE) $(MAKEOPTS) $(BIN)/libiobex.so TARGET=IOBEX_DLL @$(MAKE) $(MAKEOPTS) $(BIN)/libxptobex.so TARGET=OBEX_DLL #-------------------------------------------------- # libxpt.so - The xpt manager layer libxpt.so: $(OFILES) $(LINK.o) -o$@ $^ $(LDLIBS) $(BIN)/libxpt.so: libxpt.so cp $^ $(BIN) #-------------------------------------------------- # libxpthttp.so - The http transport implementation libxpthttp.so: $(OFILES) $(LINK.o) -o$@ $^ $(LDLIBS) $(BIN)/libxpthttp.so: libxpthttp.so cp $^ $(BIN) #-------------------------------------------------- # libxptwsp.so - The wsp transport implementation libxptwsp.so: $(OFILES) $(LINK.o) -o$@ $^ $(LDLIBS) $(BIN)/libxptwsp.so: libxptwsp.so cp $^ $(BIN) #------------ # libxptawsp.so - A non-working, skeleton wsp communication stack, for testing libxptawsp.so: $(OFILES) $(LINK.o) -o$@ $^ $(LDLIBS) $(BIN)/libxptawsp.so: libxptawsp.so cp $^ $(BIN) #-------------------------------------------------- # libiobex.so - Utility DLL used by the Obex transport implementation libiobex.so: $(OFILES) $(LINK.o) -o$@ $^ $(LDLIBS) $(BIN)/libiobex.so: libiobex.so cp $^ $(BIN) #-------------------------------------------------- # libxptobex.so - The obex transport implementation libxptobex.so: $(OFILES) $(LINK.o) -o$@ $^ $(LDLIBS) $(BIN)/libxptobex.so: libxptobex.so cp $^ $(BIN) #-------------------------------------------------- # cleanup clean: -rm *.o *.so 2>/dev/null #-------------------------------------------------- # # dependencies # # libxpt.so dependencies xptcomm.o: xpt.h xptdef.h smldef.h define.h smlerr.h xptTransport.h \ xptcomm.h utilities.h xptport.h utilities.o: xpt.h xptdef.h smldef.h define.h smlerr.h xptTransport.h \ utilities.h # libxpthttp.so dependencies digcalc.o: global.h md5.h xptport.h xptdef.h define.h digcalc.h httpserverports.o: httpdefs.h xptdef.h xptport.h define.h xpt.h smldef.h \ smlerr.h httpserverports.h xpt-tcp.h xpttypes.h xptmutex.h httptrans.o: httpdefs.h xptdef.h xptport.h define.h httptrans.h \ xptTransport.h xpt.h smldef.h smlerr.h xpttypes.h xpt-http.h \ xpt-tcp.h xpt-auth.h md5.o: global.h md5.h xpt-auth.o: xptport.h xptdef.h define.h xpt-b64.h xpttypes.h digcalc.h \ xpt-auth.h xpt-b64.o: xptport.h xptdef.h define.h xpttypes.h xpt-b64.h xptib64.h xpt-http.o: xpttypes.h xptihttp.h xpt-tcp.h xpt-http.h xpt-auth.h \ xpt.h xptdef.h smldef.h define.h smlerr.h xptport.h xpt-tcp.o: xptitcp.h xpttypes.h xptport.h xptdef.h define.h xpt-tcp.h xptmutex.o: xptmutex.h # libxptawsp.so dependencies awsp.o: awsp.h xptdef.h xptTransport.h xpt.h smldef.h define.h smlerr.h \ xptport.h # libxptwsp.so dependencies protocol.o: protocol.h xpt.h xptdef.h smldef.h define.h smlerr.h \ xptTransport.h awsp.h session.h wspdef.h settings.h \ wsphttp.h transact.h xptport.h session.o: session.h awsp.h xptdef.h xptTransport.h xpt.h smldef.h \ define.h smlerr.h wspdef.h wsputil.h xptport.h settings.o: settings.h awsp.h xptdef.h wsphttp.h xptTransport.h xpt.h \ smldef.h define.h smlerr.h wspdef.h wsputil.h xptport.h transact.o: transact.h awsp.h xptdef.h xpt.h smldef.h define.h smlerr.h \ wsphttp.h xptTransport.h wspdef.h wsputil.h xptiwsp.h \ xptport.h wspcbk.o: awsp.h xptdef.h xpt-wsp.h xptTransport.h xpt.h smldef.h define.h \ smlerr.h protocol.h session.h wspdef.h settings.h \ wsphttp.h transact.h wsphttp.o: wsphttp.h xptTransport.h xptdef.h xpt.h smldef.h define.h \ smlerr.h wspdef.h wsputil.h xptport.h wsputil.o: wsputil.h xptTransport.h xptdef.h xpt.h smldef.h define.h \ smlerr.h wspdef.h xptport.h xpt-wsp.o: xpt-wsp.h xptTransport.h xptdef.h xpt.h smldef.h define.h \ smlerr.h protocol.h awsp.h session.h wspdef.h \ settings.h wsphttp.h transact.h # libiobex.so dependencies buffer.o: buffer.h obex/constants.h utils.h iConstants.h debug.h obex/error.h debug.o: debug.h iConstants.h obex/constants.h buffer.h utils.h obex/error.h handle.o: handle.h obex/constants.h iConstants.h buffer.h utils.h debug.h \ obex/error.h transport.h header.o: header.h obex/constants.h buffer.h utils.h iConstants.h debug.h \ obex/error.h handle.h object.h inetTransport.o: inetTransport.h iConstants.h obex/constants.h buffer.h \ utils.h debug.h obex/error.h irTransport.o: irTransport.h iConstants.h obex/constants.h buffer.h utils.h \ debug.h obex/error.h obex.o: obex/obex.h obex/constants.h obex/error.h iConstants.h buffer.h \ utils.h debug.h handle.h object.h header.h transport.h object.o: object.h iConstants.h obex/constants.h buffer.h utils.h debug.h \ obex/error.h handle.h header.h transport.o: transport.h obex/constants.h iConstants.h buffer.h utils.h \ debug.h obex/error.h irTransport.h inetTransport.h utils.o: utils.h iConstants.h obex/constants.h buffer.h debug.h obex/error.h # libxptobex.so dependencies obexbinding.o: obexbinding.h smldef.h define.h xptTransport.h xptdef.h xpt.h \ smlerr.h obex/obex.h obex/constants.h obex/error.h obexbindingerror.h |
|
From: Kidong L. <bri...@us...> - 2004-06-12 04:14:34
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/bld In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17386/bld Added Files: makePalm Log Message: Added files to build on PalmOS/prc-tools Fixed compilation errors on PalmOS/prc-tools --- NEW FILE: makePalm --- # # Copyright Notice # Copyright (c) Ericsson, IBM, Lotus, Matsushita Communication # Industrial Co., Ltd., Motorola, Nokia, Openwave Systems, Inc., # Palm, Inc., Psion, Starfish Software, Symbian, Ltd. (2001). # All Rights Reserved. # Implementation of all or part of any Specification may require # licenses under third party intellectual property rights, # including without limitation, patent rights (such a third party # may or may not be a Supporter). The Sponsors of the Specification # are not responsible and shall not be held responsible in any # manner for identifying or failing to identify any or all such # third party intellectual property rights. # # THIS DOCUMENT AND THE INFORMATION CONTAINED HEREIN ARE PROVIDED # ON AN "AS IS" BASIS WITHOUT WARRANTY OF ANY KIND AND ERICSSON, IBM, # LOTUS, MATSUSHITA COMMUNICATION INDUSTRIAL CO. LTD, MOTOROLA, # NOKIA, PALM INC., PSION, STARFISH SOFTWARE AND ALL OTHER SYNCML # SPONSORS DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING # BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION # HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF # MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT # SHALL ERICSSON, IBM, LOTUS, MATSUSHITA COMMUNICATION INDUSTRIAL CO., # LTD, MOTOROLA, NOKIA, PALM INC., PSION, STARFISH SOFTWARE OR ANY # OTHER SYNCML SPONSOR BE LIABLE TO ANY PARTY FOR ANY LOSS OF # PROFITS, LOSS OF BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF # BUSINESS, OR FOR DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, # PUNITIVE OR CONSEQUENTIAL DAMAGES OF ANY KIND IN CONNECTION WITH # THIS DOCUMENT OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED # OF THE POSSIBILITY OF SUCH LOSS OR DAMAGE. # # The above notice and this paragraph must be included on all copies # of this document that are made. # # # # test parameter # if [ "$1" != "clean" ] && [ "$1" != "sml" ] && [ "$1" != "xpt" ] && [ "$1" != "all" ]; then echo "Usage: makeLinux all|sml|xpt|clean" exit -1 fi # # now compile # cd palm make $1 cd .. |
|
From: Kidong L. <bri...@us...> - 2004-06-12 04:08:38
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/bld/palm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13838/palm Log Message: Directory /cvsroot/syncml-ctoolkit/toolkit/src/bld/palm added to the repository |
|
From: Kidong L. <bri...@us...> - 2004-06-09 12:45:15
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27158/sml/mgr/all Modified Files: mgrcmdbuilder.c mgrcmddispatcher.c mgrinstancelist.c mgrinstancemgr.c Log Message: Moved *Info() function prototypes to mgr.h Index: mgrcmdbuilder.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrcmdbuilder.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mgrcmdbuilder.c 9 Jun 2004 10:24:56 -0000 1.7 --- mgrcmdbuilder.c 9 Jun 2004 12:45:05 -0000 1.8 *************** *** 66,75 **** extern Ret_t smlUnlockWriteBuffer(InstanceID_t id, MemSize_t writtenBytes); - #ifndef __SML_LITE__ /* these API calls are NOT included in the Toolkit lite version */ - extern Ret_t addInfo(InstanceInfoPtr_t pInfo); - extern InstanceInfoPtr_t findInfo(InstanceID_t id); - extern Ret_t removeInfo(InstanceID_t id); - #endif - /* Prototypes of exported SyncML API functions */ SML_API Ret_t smlStartMessage(InstanceID_t id, SmlSyncHdrPtr_t pContent); --- 66,69 ---- Index: mgrcmddispatcher.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrcmddispatcher.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mgrcmddispatcher.c 9 Jun 2004 10:24:56 -0000 1.5 --- mgrcmddispatcher.c 9 Jun 2004 12:45:05 -0000 1.6 *************** *** 68,76 **** /* Used external functions */ - #ifndef __SML_LITE__ /* these API calls are NOT included in the Toolkit lite version */ - extern Ret_t addInfo(InstanceInfoPtr_t pInfo); - extern InstanceInfoPtr_t findInfo(InstanceID_t id); - extern Ret_t removeInfo(InstanceID_t id); - #endif Ret_t smlLockReadBuffer(InstanceID_t id, MemPtr_t *pReadPosition, MemSize_t *usedSize); Ret_t smlUnlockReadBuffer(InstanceID_t id, MemSize_t processedBytes); --- 68,71 ---- Index: mgrinstancelist.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrinstancelist.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mgrinstancelist.c 9 Jun 2004 10:24:56 -0000 1.4 --- mgrinstancelist.c 9 Jun 2004 12:45:05 -0000 1.5 *************** *** 70,86 **** - /* SyncML internal function prototypes */ - Ret_t addInfo(InstanceInfoPtr_t pInfo); - InstanceInfoPtr_t findInfo(InstanceID_t id); - Ret_t removeInfo(InstanceID_t id); - - - /* Private function prototypes */ - - - - - - /************************************************************************* * SyncML internal functions --- 70,73 ---- Index: mgrinstancemgr.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrinstancemgr.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mgrinstancemgr.c 9 Jun 2004 10:24:56 -0000 1.4 --- mgrinstancemgr.c 9 Jun 2004 12:45:05 -0000 1.5 *************** *** 63,76 **** - - /* Used external functions */ - #ifndef NOWSM - #ifndef __SML_LITE__ /* Only ONE instance is supported in the Toolkit lite version */ - extern Ret_t addInfo(InstanceInfoPtr_t pInfo); - extern InstanceInfoPtr_t findInfo(InstanceID_t id); - extern Ret_t removeInfo(InstanceID_t id); - #endif - #endif - /* Prototypes of exported SyncML API functions */ SML_API Ret_t smlInitInstance(SmlCallbacksPtr_t callbacks, SmlInstanceOptionsPtr_t pOptions, VoidPtr_t pUserData, InstanceID_t *pInstanceID); --- 63,66 ---- |
|
From: Kidong L. <bri...@us...> - 2004-06-09 12:45:15
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27158/sml/mgr/inc Modified Files: mgr.h Log Message: Moved *Info() function prototypes to mgr.h Index: mgr.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/inc/mgr.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mgr.h 9 Jun 2004 10:24:56 -0000 1.5 --- mgr.h 9 Jun 2004 12:45:06 -0000 1.6 *************** *** 139,147 **** TokenInfoPtr_t tokTbl; } *SyncMLInfoPtr_t, SyncMLInfo_t; - #endif - - - - #ifndef NOWSM /************************************************************************* --- 139,142 ---- *************** *** 154,157 **** --- 149,159 ---- Ret_t mgrResetWorkspace (InstanceID_t id); + #ifndef __SML_LITE__ /* these API calls are NOT included in the Toolkit lite version */ + /* SyncML internal function prototypes */ + Ret_t addInfo(InstanceInfoPtr_t pInfo); + InstanceInfoPtr_t findInfo(InstanceID_t id); + Ret_t removeInfo(InstanceID_t id); + #endif + #endif // !defined(NOWSM) |
|
From: Kidong L. <bri...@us...> - 2004-06-09 10:25:06
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31977/all Modified Files: mgr.c mgrcmdbuilder.c mgrcmddispatcher.c mgrinstancelist.c mgrinstancemgr.c Log Message: Removed duplicated function prototype and comments Index: mgrcmdbuilder.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrcmdbuilder.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mgrcmdbuilder.c 24 May 2004 01:33:36 -0000 1.6 --- mgrcmdbuilder.c 9 Jun 2004 10:24:56 -0000 1.7 *************** *** 114,118 **** /* Private function prototypes */ static Ret_t mgrCreateNextCommand(InstanceID_t id, SmlProtoElement_t cmdType, VoidPtr_t pContent); - Ret_t mgrResetWorkspace (InstanceID_t id); --- 114,117 ---- Index: mgrcmddispatcher.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrcmddispatcher.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mgrcmddispatcher.c 24 May 2004 01:33:36 -0000 1.4 --- mgrcmddispatcher.c 9 Jun 2004 10:24:56 -0000 1.5 *************** *** 82,86 **** static Ret_t mgrProcessNextCommand(InstanceID_t id, InstanceInfoPtr_t pInstanceInfo); static Ret_t mgrProcessStartMessage(InstanceID_t id, InstanceInfoPtr_t pInstanceInfo); - Ret_t mgrResetWorkspace (InstanceID_t id); --- 82,85 ---- Index: mgrinstancelist.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrinstancelist.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mgrinstancelist.c 24 May 2004 01:33:36 -0000 1.3 --- mgrinstancelist.c 9 Jun 2004 10:24:56 -0000 1.4 *************** *** 70,79 **** - /* Used external functions */ - SyncMLInfoPtr_t mgrGetSyncMLAnchor(void); - InstanceInfoPtr_t mgrGetInstanceListAnchor(void); - void mgrSetInstanceListAnchor(InstanceInfoPtr_t newListAnchor); - - /* SyncML internal function prototypes */ Ret_t addInfo(InstanceInfoPtr_t pInfo); --- 70,73 ---- Index: mgr.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgr.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mgr.c 24 May 2004 01:33:36 -0000 1.5 --- mgr.c 9 Jun 2004 10:24:56 -0000 1.6 *************** *** 82,90 **** SML_API Ret_t smlTerminate(void); - /* SyncML internal function prototypes */ - InstanceInfoPtr_t mgrGetInstanceListAnchor(void); - void mgrSetInstanceListAnchor(InstanceInfoPtr_t newListAnchor); - SyncMLInfoPtr_t mgrGetSyncMLAnchor(void); - /** --- 82,85 ---- Index: mgrinstancemgr.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrinstancemgr.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mgrinstancemgr.c 24 May 2004 01:33:36 -0000 1.3 --- mgrinstancemgr.c 9 Jun 2004 10:24:56 -0000 1.4 *************** *** 71,75 **** extern Ret_t removeInfo(InstanceID_t id); #endif - SyncMLInfoPtr_t mgrGetSyncMLAnchor(void); #endif --- 71,74 ---- *************** *** 99,103 **** Ret_t freeInstanceOptions (InstanceInfoPtr_t pInstanceInfo); static Ret_t freeInstanceInfo (InstanceInfoPtr_t pInfo); - Ret_t mgrResetWorkspace (InstanceID_t id); Ret_t setInstanceOptions (InstanceID_t id, SmlInstanceOptionsPtr_t pOptions); --- 98,101 ---- |
|
From: Kidong L. <bri...@us...> - 2004-06-09 10:25:05
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31977/inc Modified Files: mgr.h Log Message: Removed duplicated function prototype and comments Index: mgr.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/inc/mgr.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mgr.h 24 May 2004 01:33:36 -0000 1.4 --- mgr.h 9 Jun 2004 10:24:56 -0000 1.5 *************** *** 149,176 **** *************************************************************************/ - - /** - * Retrieves a pointer to the structure holding all global informations within SyncML - * - * @return Pointer to the pGlobalAnchor - */ SyncMLInfoPtr_t mgrGetSyncMLAnchor(void); - - - /** - * Retrieves a pointer to the list holding all instance informations - * - * @return Pointer to the pInstanceListAnchor - */ InstanceInfoPtr_t mgrGetInstanceListAnchor(void); - - - /** - * Set the pointer to the list holding all instance informations - * - * @param newListAnchor (IN) - * pointer to the pInstanceListAnchor - */ void mgrSetInstanceListAnchor(InstanceInfoPtr_t newListAnchor); #endif // !defined(NOWSM) --- 149,156 ---- *************************************************************************/ SyncMLInfoPtr_t mgrGetSyncMLAnchor(void); InstanceInfoPtr_t mgrGetInstanceListAnchor(void); void mgrSetInstanceListAnchor(InstanceInfoPtr_t newListAnchor); + Ret_t mgrResetWorkspace (InstanceID_t id); #endif // !defined(NOWSM) |
|
From: Kidong L. <bri...@us...> - 2004-06-04 01:16:53
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/obex/smlobex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6337/bindings/obex/smlobex Modified Files: inetTransport.c Log Message: Changed meta info value entry "Host" -> "HOST", "Port" -> "PORT" in iobxInetTransportInitialize() according to documentation. Index: inetTransport.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/obex/smlobex/inetTransport.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** inetTransport.c 24 May 2004 01:33:46 -0000 1.4 --- inetTransport.c 4 Jun 2004 01:16:40 -0000 1.5 *************** *** 82,86 **** ** Port? */ ! p = iobxGetMetaInfoValue( meta, "Port", &len ); if ( !p || len > 5 ) { obxMeta.port = OBEX_PORT; /* let it default */ --- 82,86 ---- ** Port? */ ! p = iobxGetMetaInfoValue( meta, "PORT", &len ); if ( !p || len > 5 ) { obxMeta.port = OBEX_PORT; /* let it default */ *************** *** 102,106 **** */ if ( rc == OBX_RC_OK ) { ! p = iobxGetMetaInfoValue( meta, "Host", &len ); if ( !p ) { // %%% Calin: There may be no Host assigned, like when be a OBEX server. --- 102,106 ---- */ if ( rc == OBX_RC_OK ) { ! p = iobxGetMetaInfoValue( meta, "HOST", &len ); if ( !p ) { // %%% Calin: There may be no Host assigned, like when be a OBEX server. |
|
From: Kidong L. <bri...@us...> - 2004-06-04 01:10:52
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5910 Modified Files: dynamicTransports Log Message: Added OBEX transport binding Index: dynamicTransports =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/examples/dynamicTransports,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dynamicTransports 11 Apr 2004 15:17:21 -0000 1.1 --- dynamicTransports 4 Jun 2004 01:10:44 -0000 1.2 *************** *** 1 **** --- 1,2 ---- xpthttp + xptobex |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:34
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/wsm/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/sml/wsm/inc Modified Files: wsm.h wsm_sm.h Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: wsm_sm.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/wsm/inc/wsm_sm.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wsm_sm.h 6 Aug 2002 20:42:51 -0000 1.1 --- wsm_sm.h 24 May 2004 01:33:38 -0000 1.2 *************** *** 1,13 **** ! /*************************************************************************/ ! /* module: SyncML WorkSpace Manager */ ! /* */ ! /* file: WSM_SM.h */ ! /* target system: All */ ! /* target OS: All */ ! /* */ ! /* Description */ ! /* Storage Management for Workspace Manager API <BR> */ ! /* Encapsulates OS dependent parts of WSM. */ ! /*************************************************************************/ --- 1,11 ---- ! /** ! * @file ! * SyncML WorkSpace Manager ! * ! * @target_system All ! * @target_os All ! * @description Storage Management for Workspace Manager API ! * Encapsulates OS dependent parts of WSM. ! */ *************** *** 49,55 **** - /** - * @version @label - */ #ifndef _WSM_SM_H --- 47,50 ---- *************** *** 60,71 **** #ifdef __ANSI_C__ ! /* sbuffer list */ typedef struct smWinList_s { ! char *memName; // name of buffer ! char *winH; // reference to memory block ! MemHandle_t memH; // handle of memory block ! Byte_t locked; // is handle locked? ! MemSize_t memSize; // size of memory block ! struct smWinList_s *next; // next list item } smWinList_t; typedef smWinList_t *WsmSmGlobals_t; --- 55,66 ---- #ifdef __ANSI_C__ ! /** sbuffer list */ typedef struct smWinList_s { ! char *memName; /**< name of buffer */ ! char *winH; /**< reference to memory block */ ! MemHandle_t memH; /**< handle of memory block */ ! Byte_t locked; /**< is handle locked? */ ! MemSize_t memSize; /**< size of memory block */ ! struct smWinList_s *next; /**< next list item */ } smWinList_t; typedef smWinList_t *WsmSmGlobals_t; *************** *** 74,94 **** #ifdef __PALM_OS__ #include <Pilot.h> ! /* dynamic buffer array */ typedef struct smPalm_s { ! Handle smPalmH; // reference to only memory block ! MemHandle_t smMemH; // handle of only memory block ! Byte_t smLocked; // is handle locked? } WsmSmGlobals_t; #endif #ifdef __EPOC_OS__ ! /* sbuffer list */ typedef struct smWinList_s { ! char *memName; // name of buffer ! char *winH; // reference to memory block ! MemHandle_t memH; // handle of memory block ! Byte_t locked; // is handle locked? ! MemSize_t memSize; // size of memory block ! struct smWinList_s *next; // next list item } smWinList_t; typedef smWinList_t *WsmSmGlobals_t; --- 69,89 ---- #ifdef __PALM_OS__ #include <Pilot.h> ! /** dynamic buffer array */ typedef struct smPalm_s { ! Handle smPalmH; /**< reference to only memory block */ ! MemHandle_t smMemH; /**< handle of only memory block */ ! Byte_t smLocked; /**< is handle locked? */ } WsmSmGlobals_t; #endif #ifdef __EPOC_OS__ ! /** sbuffer list */ typedef struct smWinList_s { ! char *memName; /**< name of buffer */ ! char *winH; /**< reference to memory block */ ! MemHandle_t memH; /**< handle of memory block */ ! Byte_t locked; /**< is handle locked? */ ! MemSize_t memSize; /**< size of memory block */ ! struct smWinList_s *next; /**< next list item */ } smWinList_t; typedef smWinList_t *WsmSmGlobals_t; *************** *** 96,288 **** - /** - * FUNCTION: smCreate - * - * Creates a new memory block with name memName and size memSize. - * - * PRE-Condition: OS does not know memName; memSize > 0 - * - * POST-Condition: memName exists with size memSize; - * memH refers to new memory block. - * - * IN: memName - * Name of new memory block - * IN: memSize - * Size of new memory block - * - * OUT: memH - * Handle to new memory block - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_USAGE, if memName is already known to the OS - * SML_ERR_INVALID_SIZE, if memSize <= 0 - * SML_ERR_NOT_ENOUGH_SPACE, if available memory < memSize - * - * @see smDestroy - */ Ret_t smCreate (String_t memName, MemSize_t memSize, MemHandle_t *memH); - - - /** - * FUNCTION: smOpen - * - * Open connection to memory block with name memName. - * - * PRE-Condition: OS does know memName - * - * POST-Condition: memH refers to memory block memName - * - * IN: memName - * Name of memory block to open - * - * OUT: memH - * Handle to opened memory block - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memName is unknown - * - * @see smClose - */ Ret_t smOpen (String_t memName, MemHandle_t *memH); - - - /** - * FUNCTION: smClose - * - * Close link to memory block. - * - * PRE-Condition: memH is a valid memory block handle; memH is unlocked; - * no pointers to records are in use - * - * POST-Condition: memH is not valid anymore - * - * IN: memH - * Handle to close - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_USAGE, if memH is locked - * - * @see smOpen - */ Ret_t smClose (MemHandle_t memH); - - - /** - * FUNCTION: smDestroy - * - * Remove memory block memName within OS. - * - * PRE-Condition: memName is a valid memory block name; - * memory block is not in use (i.e. no handles and - * pointers to this memory block are in use) - * - * POST-Condition: memName is not a valid memory block name anymore - * - * IN: memName - * Name of memory block to remove - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memName is unknown - * SML_ERR_WRONG_USAGE, if memory block is still locked - * - * @see smCreate - */ Ret_t smDestroy (String_t memName); - - - /** - * FUNCTION: smLock - * - * Map memory block memH to local address space. - * - * PRE-Condition: memH is a valid handle; memory block is not locked - * - * POST-Condition: pMem points to memory block memH; - * memory block is locked - * - * IN: memH - * Handle to memory block - * - * OUT: pMem - * Pointer to memory block memH mapped in local address space - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memH is unknown - * SML_ERR_WRONG_USAGE, if memH was already locked - * SML_ERR_UNSPECIFIC, if lock failed - * - * @see smUnlock - */ Ret_t smLock (MemHandle_t memH, MemPtr_t *pMem); - - - /** - * FUNCTION: smUnlock - * - * Free pointer mapped to memH memory block. - * - * PRE-Condition: memH is a valid handle; memory block is locked - * - * POST-Condition: memory block is unlocked - * - * IN: memH - * Handle to memory block - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memH is unknown - * SML_ERR_WRONG_USAGE, if memH was already unlocked - * SML_ERR_UNSPECIFIC, if unlock failed - * - * @see smLock - */ Ret_t smUnlock (MemHandle_t memH); - - - /** - * FUNCTION: smSetSize - * - * Set size of memory block memH to newSize. - * - * PRE-Condition: memH is a valid handle; newSize > 0; - * memory block is unlocked - * - * POST-Condition: memory block size = newSize - * - * IN: memH - * Handle to memory block - * IN: newSize - * New size of memory block - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memH is unknown - * SML_ERR_WRONG_USAGE, if memH is locked - * SML_ERR_INVALID_SIZE, if newSize <= 0 - * SML_ERR_NOT_ENOUGH_SPACE, if available memory < newSize - * - * @see smGetSize - */ Ret_t smSetSize (MemHandle_t memH, MemSize_t newSize); - - - /** - * FUNCTION: smGetSize - * - * Get size of memory block memH. - * - * PRE-Condition: memH is a valid handle - * - * POST-Condition: actSize = memory block size - * - * IN: memH - * Handle to memory block - * - * OUT: actSize - * Actual size of memory block - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memH is unknown - * - * @see smSetSize - */ Ret_t smGetSize (MemHandle_t memH, MemSize_t *actSize); --- 91,101 ---- Index: wsm.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/wsm/inc/wsm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wsm.h 2 May 2003 22:05:08 -0000 1.2 --- wsm.h 24 May 2004 01:33:38 -0000 1.3 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: SyncML WorkSpace Manager */ ! /* file: WSM.h */ ! /* target system: All */ ! /* target OS: All */ ! /*************************************************************************/ --- 1,11 ---- ! /** ! * @file ! * SyncML WorkSpace Manager ! * ! * @target_system All ! * @target_os All ! * @description Workspace Manager API ! * Manages the SyncML document in memory. ! */ *************** *** 44,54 **** - /** - * Workspace Manager API <BR> - * Manages the SyncML document in memory. - * - * @version @label - * - */ #ifndef _WSM_H --- 47,50 ---- *************** *** 64,68 **** typedef struct WsmOptions_s { ! MemSize_t maxAvailMem; // maximum amount of memory available for all wsm buffers } WsmOptions_t; --- 60,64 ---- typedef struct WsmOptions_s { ! MemSize_t maxAvailMem; /**< maximum amount of memory available for all wsm buffers */ } WsmOptions_t; *************** *** 83,92 **** /** WSM internal buffer structure */ typedef struct WsmBuf_s { ! String_t bufName; // external name of buffer ! MemHandle_t memH; // memory handle ! MemPtr_t pFirstFree; // pointer to first free element in buffer ! MemPtr_t pFirstData; // pointer to first data element in buffer ! MemSize_t size; // size of buffer ! MemSize_t usedBytes; // used bytes in buffer Byte_t flags; } WsmBuf_t; --- 79,88 ---- /** WSM internal buffer structure */ typedef struct WsmBuf_s { ! String_t bufName; /**< external name of buffer */ ! MemHandle_t memH; /**< memory handle */ ! MemPtr_t pFirstFree; /**< pointer to first free element in buffer */ ! MemPtr_t pFirstData; /**< pointer to first data element in buffer */ ! MemSize_t size; /**< size of buffer */ ! MemSize_t usedBytes; /**< used bytes in buffer */ Byte_t flags; } WsmBuf_t; *************** *** 95,427 **** /** WSM globals for use with global Anchor */ typedef struct WsmGlobals_s { ! Ret_t wsmRet; // last WSM return code ! Byte_t initWasCalled; // was wsmInit() called? WsmBuf_t wsmBuf[MAX_WSM_BUFFERS]; ! Short_t wsmIndex; // Index of actual buffer ! WsmSmGlobals_t wsmSm; // WSM_SM global; device dependent! } *WsmGlobalsPtr_t, WsmGlobals_t; - - /** - * FUNCTION: wsmInit - * - * Initializes all Workspace Manager related resources.<BR> - * Should only be called once! - * - * PRE-Condition: This is the first function call to WSM - * - * POST-Condition: All WSM resources are initialized - * - * IN: wsmOpts - * WSM options, valid options are: - * <UL> - * <LI> tbd - * </UL> - * - * OUT: wsmH - * Handle to new buffer - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_INVALID_OPTIONS, if wsmOpts is not valid - * SML_ERR_NOT_ENOUGH_SPACE, if not enough available memory - * SML_ERR_WRONG_USAGE, if wsmInit was already called - */ Ret_t wsmInit (const WsmOptions_t *wsmOpts); - - - /** - * FUNCTION: wsmCreate - * - * Creates and opens a new buffer with name bufName and size bufSize.<BR> - * If a buffer with name bufName already exists, the existing buffer - * is resized to bufSize. - * - * PRE-Condition: bufSize > 0 - * - * POST-Condition: handle refers to buffer bufName; BufferSize = size - * - * IN: bufName - * Name of buffer to be created - * IN: bufSize - * Size of buffer to be created - * - * OUT: wsmH - * Handle to new buffer - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_INVALID_SIZE, if bufSize <= 0 - * SML_ERR_NOT_ENOUGH_SPACE, if available memory < bufSize - * SML_ERR_WSM_BUF_TABLE_FULL, if buffer table is full - * SML_ERR_WRONG_USAGE, if wsmInit wasn't called before - * - * @see wsmDestroy - */ Ret_t wsmCreate (String_t bufName, MemSize_t bufSize, MemHandle_t *wsmH); - - - /** - * FUNCTION: wsmOpen - * - * Open existing buffer with name bufName. - * - * PRE-Condition: WSM knows bufName - * - * POST-Condition: wsmH refers to buffer bufName - * - * IN: bufName - * Name of buffer to be opened - * - * OUT: wsmH - * Handle to new buffer - * - * RETURN: SML_ERR_OK, if O.K. - * SML_WRONG_PARAM, if bufName is unknown - * - * @see wsmClose - */ Ret_t wsmOpen (String_t bufName, MemHandle_t *wsmH); - - - /** - * FUNCTION: wsmClose - * - * Close an open buffer. - * - * PRE-Condition: handle is valid; handle is unlocked - * - * POST-Condition: handle is not known to WSM any more - * - * IN: wsmH - * Handle to the open buffer - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_INVALID_HANDLE, if handle was invalid - * SML_ERR_WRONG_USAGE, if handle was still locked - * - * @see wsmOpen - */ Ret_t wsmClose (MemHandle_t wsmH); - - - /** - * FUNCTION: wsmDestroy - * - * Destroy existing buffer with name bufName. - * - * PRE-Condition: WSM knows bufName; handle is unlocked - * - * POST-Condition: buffer is not known to WSM any more; all resources - * connected to this buffer are freed - * - * IN: bufName - * Name of buffer to be opened - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if bufName is unknown to WSM - * SML_ERR_WRONG_USAGE, if handle was still locked - * - * @see wsmCreate - */ Ret_t wsmDestroy (String_t bufName); - - - /** - * FUNCTION: wsmTerminate - * - * Terminate WSM; free all buffers and resources. - * - * PRE-Condition: all handles must be unlocked - * - * POST-Condition: all resources are freed - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_USAGE, if a handle was still locked - * - */ Ret_t wsmTerminate (void); - - /** - * FUNCTION: wsmProcessedBytes - * - * Tell Workspace Manager the number of bytes already processed. - * - * PRE-Condition: handle is locked; handle is valid; - * noBytes <= wsmGetUsedSize - * - * POST-Condition: noBytes starting at wsmGetPtr() position are deleted; - * remaining bytes are copied to - * wsmGetPtr(SML_FIRST_FREE_ITEM) position; - * wsmGetUsedSize -= noBytes; wsmGetFreeSize += noBytes - * - * IN: wsmH - * Handle to the open buffer - * IN: noBytes - * Number of bytes already processed from buffer. - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_INVALID_HANDLE, if handle was invalid - * SML_ERR_WRONG_USAGE, if handle was not locked - * SML_ERR_INVALID_SIZE, if noBytes > wsmGetUsedSize - * - * @see wsmGetFreeSize - */ Ret_t wsmProcessedBytes (MemHandle_t wsmH, MemSize_t noBytes); ! ! ! /** ! * FUNCTION: wsmLockH ! * ! * Locks handle wsmH and get a pointer to the contents of wsmH. <BR> ! * RequestedPos describes the position in the buffer to which the returned ! * pointer should point to. Valid values are: ! * <UL> ! * <LI> SML_FIRST_DATA_ITEM ! * <LI> SML_FIRST_FREE_ITEM ! * </UL> ! * ! * PRE-Condition: handle is unlocked; handle is valid ! * ! * POST-Condition: handle is locked; points to first data item, ! * or first free item. ! * ! * IN: wsmH ! * Handle to the open buffer ! * IN: requestedPos ! * Requested position of the returned pointer ! * <UL> ! * <LI> SML_FIRST_DATA_ITEM : points to first data entry ! * <LI> SML_FIRST_FREE_ITEM : points to first free entry ! * </UL> ! * ! * OUT: pMem ! * Pointer to requested memory ! * ! * RETURN: SML_ERR_OK, if O.K. ! * SML_ERR_INVALID_HANDLE, if handle was invalid ! * SML_ERR_WRONG_USAGE, if handle was still locked ! * SML_ERR_UNSPECIFIC, if requested position is unknown, or lock failed ! * ! * @see wsmUnlockH ! */ ! Ret_t wsmLockH (MemHandle_t wsmH, SmlBufPtrPos_t requestedPos, ! MemPtr_t *pMem); ! ! ! /** ! * FUNCTION: wsmGetFreeSize ! * ! * Returns the remaining unused bytes in the buffer. ! * ! * PRE-Condition: handle is valid ! * ! * POST-Condition: wsmGetFreeSize = BufferSize - wsmGetUsedSize ! * ! * IN: wsmH ! * Handle to the open buffer ! * ! * OUT: freeSize ! * Number of bytes which are unused in this buffer ! * ! * RETURN: SML_ERR_OK, if O.K. ! * SML_ERR_INVALID_HANDLE, if handle was invalid ! * ! * @see wsmGetUsedSize ! * @see wsmProcessedBytes ! */ Ret_t wsmGetFreeSize(MemHandle_t wsmH, MemSize_t *freeSize); - - - /** - * FUNCTION: wsmGetUsedSize - * - * Returns the number of bytes used in the buffer. - * - * PRE-Condition: handle is valid - * - * POST-Condition: usedSize = BufferSize - wsmGetFreeSize - * - * IN: wsmH - * Handle to the open buffer - * - * OUT: usedSize - * Number of bytes which are already used in this buffer - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_INVALID_HANDLE, if handle was invalid - * - * @see wsmGetFreeSize - * @see wsmSetUsedSize - */ Ret_t wsmGetUsedSize(MemHandle_t wsmH, MemSize_t *usedSize); - - - /** - * FUNCTION: wsmUnlockH - * - * Unlock handle wsmH. <BR> - * After this call all pointers to this memory handle are invalid - * and should no longer be used. - * - * PRE-Condition: handle is locked; handle is valid - * - * POST-Condition: handle is unlocked - * - * OUT: wsmH - * Handle to unlock - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_INVALID_HANDLE, if handle was invalid - * SML_ERR_WRONG_USAGE, if handle was not locked - * SML_ERR_UNSPECIFIC, unlock failed - * - * @see wsmLockH - */ Ret_t wsmUnlockH (MemHandle_t wsmH); - - - /** - * FUNCTION: wsmSetUsedSize - * - * Tell Workspace how many data were written into buffer. - * - * PRE-Condition: handle is valid; usedSize <= wsmGetFreeSize; handle is - * locked - * - * POST-Condition: wsmGetUsedSize += usedSize; wsmGetFreeSize -= usedSize; - * instancePtr += usedSize; - * - * IN: wsmH - * Handle to the open buffer - * IN: usedSize - * Number of bytes which were written into buffer - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_INVALID_HANDLE, if handle was invalid - * SML_ERR_INVALID_SIZE, if usedSize <= wsmGetFreeSize - * - * @see wsmGetUsedSize - */ Ret_t wsmSetUsedSize (MemHandle_t wsmH, MemSize_t usedSize); - - /** - * FUNCTION: wsmReset - * - * Reset the Workspace - * - * PRE-Condition: - - * - * POST-Condition: all data is lost. The FirstFree Position equals - * the First Data position - * - * IN: wsmH - * Handle to the open buffer - * - * RETURN: SML_ERR_OK, if O.K. - * - */ Ret_t wsmReset (MemHandle_t wsmH) ; #endif // !defined(NOWSM) - #endif --- 91,116 ---- /** WSM globals for use with global Anchor */ typedef struct WsmGlobals_s { ! Ret_t wsmRet; /**< last WSM return code */ ! Byte_t initWasCalled; /**< was wsmInit() called? */ WsmBuf_t wsmBuf[MAX_WSM_BUFFERS]; ! Short_t wsmIndex; /**< Index of actual buffer */ ! WsmSmGlobals_t wsmSm; /**< WSM_SM global; device dependent! */ } *WsmGlobalsPtr_t, WsmGlobals_t; Ret_t wsmInit (const WsmOptions_t *wsmOpts); Ret_t wsmCreate (String_t bufName, MemSize_t bufSize, MemHandle_t *wsmH); Ret_t wsmOpen (String_t bufName, MemHandle_t *wsmH); Ret_t wsmClose (MemHandle_t wsmH); Ret_t wsmDestroy (String_t bufName); Ret_t wsmTerminate (void); Ret_t wsmProcessedBytes (MemHandle_t wsmH, MemSize_t noBytes); ! Ret_t wsmLockH (MemHandle_t wsmH, SmlBufPtrPos_t requestedPos, MemPtr_t *pMem); Ret_t wsmGetFreeSize(MemHandle_t wsmH, MemSize_t *freeSize); Ret_t wsmGetUsedSize(MemHandle_t wsmH, MemSize_t *usedSize); Ret_t wsmUnlockH (MemHandle_t wsmH); Ret_t wsmSetUsedSize (MemHandle_t wsmH, MemSize_t usedSize); Ret_t wsmReset (MemHandle_t wsmH) ; #endif // !defined(NOWSM) #endif |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:34
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/sml/mgr/win Modified Files: libinit.c Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: libinit.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/win/libinit.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libinit.c 2 May 2003 22:05:08 -0000 1.2 --- libinit.c 24 May 2004 01:33:37 -0000 1.3 *************** *** 1,12 **** ! /*************************************************************************/ ! /* module: Managing DLL */ ! /* */ ! /* file: libinit.c */ ! /* target system: Windows */ ! /* target OS: Windows 9x/NT */ ! /* */ ! /* Description: */ ! /* Platform dependant DLL-entry-function */ ! /*************************************************************************/ /* --- 1,10 ---- ! /** ! * @file ! * Managing DLL ! * ! * @target_system Windows ! * @target_os Windows 9x/NT ! * @description Platform dependant DLL-entry-function ! */ /* *************** *** 61,69 **** BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); ! /* ! *---------------------------------------------------------------------- ! * ! * DllMain -- ! * * This routine is called by the Mingw32, Cygwin32 or VC++ C run * time library init code, or the Borland DllEntryPoint routine. It --- 59,63 ---- BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); ! /** * This routine is called by the Mingw32, Cygwin32 or VC++ C run * time library init code, or the Borland DllEntryPoint routine. It *************** *** 71,84 **** * libraries. * ! * Results: ! * TRUE on sucess, FALSE on failure. ! * ! * Side effects: ! * ! *---------------------------------------------------------------------- */ ! BOOL APIENTRY DllMain(HINSTANCE hInst /* Library instance handle. */ , ! DWORD reason /* Reason this function is being called. */ , ! LPVOID reserved /* Not used. */ ) { --- 65,78 ---- * libraries. * ! * @param hInst (IN) ! * Library instance handle. ! * @param reason (IN) ! * Reason this function is being called. ! * @param reserved (IN) ! * Not used. ! * @return TRUE on sucess,\n ! * FALSE on failure. */ ! BOOL APIENTRY DllMain(HINSTANCE hInst, DWORD reason, LPVOID reserved) { |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:34
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/wsm/palm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/sml/wsm/palm Modified Files: wsm_sm.c Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: wsm_sm.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/wsm/palm/wsm_sm.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wsm_sm.c 2 May 2003 22:05:08 -0000 1.2 --- wsm_sm.c 24 May 2004 01:33:38 -0000 1.3 *************** *** 1,13 **** ! /*************************************************************************/ ! /* module: SyncML WorkSpace Manager */ ! /* */ ! /* file: WSM_SM.c */ ! /* target system: Palm */ ! /* target OS: PalmOS 3.5 */ ! /* */ ! /* Description */ ! /* Storage Management for Workspace Manager API. <BR> */ ! /* Palm OS version. */ ! /*************************************************************************/ --- 1,11 ---- ! /** ! * @file ! * SyncML WorkSpace Manager ! * ! * @target_system Palm ! * @target_os PalmOS 3.5 ! * @description Storage Management for Workspace Manager API. ! * Palm OS version. ! */ *************** *** 50,59 **** - /** - * @version @label - */ - - - /************************************************************************* * Definitions * --- 48,51 ---- *************** *** 90,119 **** - /** - * FUNCTION: smCreate - * - * Creates a new memory block with name memName and size memSize. - * - * PRE-Condition: OS does not know memName; memSize > 0 - * - * POST-Condition: memName exists with size memSize; - * memH refers to new memory block. - * - * IN: memName - * Name of new memory block<BR> - * Palm version: Name is ignored - * IN: memSize - * Size of new memory block - * - * OUT: memH - * Handle to new memory block - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_USAGE, if memName is already known to the OS - * SML_ERR_INVALID_SIZE, if memSize <= 0 - * SML_ERR_NOT_ENOUGH_SPACE, if available memory < memSize - * - * @see smDestroy - */ Ret_t smCreate (String_t memName, MemSize_t memSize, MemHandle_t *memH) { --- 82,85 ---- *************** *** 141,167 **** - /** - * FUNCTION: smOpen - * - * Open connection to memory block with name memName.<BR> - * Palm version: As this version is based on non-persitent memory, it - * returns SML_ERR_WRONG_PARAM, if create was not called before. - * - * PRE-Condition: OS does know memName - * - * POST-Condition: memH refers to memory block memName - * - * IN: memName - * Name of memory block to open<BR> - * Palm version: Name is ignored - * - * OUT: memH - * Handle to opened memory block - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memName is unknown - * - * @see smClose - */ Ret_t smOpen (String_t memName, MemHandle_t *memH) { --- 107,110 ---- *************** *** 175,196 **** - /** - * FUNCTION: smClose - * - * Close link to memory block. - * - * PRE-Condition: memH is a valid memory block handle; memH is unlocked; - * no pointers to records are in use - * - * POST-Condition: memH is not valid anymore - * - * IN: memH - * Handle to close - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_USAGE, if memH is locked - * - * @see smOpen - */ Ret_t smClose (MemHandle_t memH) { Err ret; --- 118,121 ---- *************** *** 207,233 **** - /** - * FUNCTION: smDestroy - * - * Remove memory block memName within OS.<BR> - * Palm version: As this version is based on non-persitent memory, no - * action is performed and it alway returns SML_ERR_OK. - * - * PRE-Condition: memName is a valid memory block name; - * memory block is not in use (i.e. no handles and - * pointers to this memory block are in use) - * - * POST-Condition: memName is not a valid memory block name anymore - * - * IN: memName - * Name of memory block to remove<BR> - * Palm version: Name is ignored - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memName is unknown - * SML_ERR_WRONG_USAGE, if memory block is still locked - * - * @see smCreate - */ Ret_t smDestroy (String_t memName) { --- 132,135 ---- *************** *** 236,262 **** - /** - * FUNCTION: smLock - * - * Map memory block memH to local address space. - * - * PRE-Condition: memH is a valid handle; memory block is not locked - * - * POST-Condition: pMem points to memory block memH; - * memory block is locked - * - * IN: memH - * Handle to memory block - * - * OUT: pMem - * Pointer to memory block memH mapped in local address space - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memH is unknown - * SML_ERR_WRONG_USAGE, if memH was already locked - * SML_ERR_UNSPECIFIC, if lock failed - * - * @see smUnlock - */ Ret_t smLock (MemHandle_t memH, MemPtr_t *pMem) { --- 138,141 ---- *************** *** 277,299 **** - /** - * FUNCTION: smUnlock - * - * Free pointer mapped to memH memory block. - * - * PRE-Condition: memH is a valid handle; memory block is locked - * - * POST-Condition: memory block is unlocked - * - * IN: memH - * Handle to memory block - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memH is unknown - * SML_ERR_WRONG_USAGE, if memH was already unlocked - * SML_ERR_UNSPECIFIC, if unlock failed - * - * @see smLock - */ Ret_t smUnlock (MemHandle_t memH) { --- 156,159 ---- *************** *** 314,340 **** - /** - * FUNCTION: smSetSize - * - * Set size of memory block memH to newSize. - * - * PRE-Condition: memH is a valid handle; newSize > 0; - * memory block is unlocked - * - * POST-Condition: memory block size = newSize - * - * IN: memH - * Handle to memory block - * IN: newSize - * New size of memory block - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memH is unknown - * SML_ERR_WRONG_USAGE, if memH is locked - * SML_ERR_INVALID_SIZE, if newSize <= 0 - * SML_ERR_NOT_ENOUGH_SPACE, if available memory < newSize - * - * @see smGetSize - */ Ret_t smSetSize (MemHandle_t memH, MemSize_t newSize) { Err ret; --- 174,177 ---- *************** *** 358,381 **** - /** - * FUNCTION: smGetSize - * - * Get size of memory block memH. - * - * PRE-Condition: memH is a valid handle - * - * POST-Condition: actSize = memory block size - * - * IN: memH - * Handle to memory block - * - * OUT: actSize - * Actual size of memory block - * - * RETURN: SML_ERR_OK, if O.K. - * SML_ERR_WRONG_PARAM, if memH is unknown - * - * @see smSetSize - */ Ret_t smGetSize (MemHandle_t memH, MemSize_t *actSize) { --- 195,198 ---- *************** *** 388,393 **** } - - - - --- 205,206 ---- |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:33
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/wsm/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/sml/wsm/win Modified Files: wsm_sm.c Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: wsm_sm.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/wsm/win/wsm_sm.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wsm_sm.c 14 Nov 2003 09:52:08 -0000 1.3 --- wsm_sm.c 24 May 2004 01:33:38 -0000 1.4 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: SyncML WorkSpace Manager */ ! /* file: WSM_SM.c */ ! /* target system: MS Windows */ ! /* target OS: Windows 98 / NT */ ! /*************************************************************************/ /* --- 1,11 ---- ! /** ! * @file ! * SyncML WorkSpace Manager ! * ! * @target_system MS Windows ! * @target_os Windows 98 / NT ! * @description Storage Management for Workspace Manager API. ! * MS Windows version. ! */ /* *************** *** 43,53 **** - /** - * Storage Management for Workspace Manager API. <BR> - * MS Windows version. - * - * @version @label - * - */ #ifndef NOWSM --- 46,49 ---- *************** *** 130,134 **** /** * search for buffer with name eleName and return pointer to it in p. ! * return == 0 if not found; 1 if found */ // luz %%% NOTE: called only from routines which lock the toolkit already, --- 126,133 ---- /** * search for buffer with name eleName and return pointer to it in p. ! * ! * @return ! * - 0 if not found; ! * - 1 if found */ // luz %%% NOTE: called only from routines which lock the toolkit already, *************** *** 147,151 **** /** * search for buffer with memHandle memH and return pointer to it in p. ! * return == 0 if not found; 1 if found */ // luz %%% NOTE: called only from routines which lock the toolkit already, --- 146,153 ---- /** * search for buffer with memHandle memH and return pointer to it in p. ! * ! * @return ! * - 0 if not found; ! * - 1 if found */ // luz %%% NOTE: called only from routines which lock the toolkit already, *************** *** 194,220 **** /** - * FUNCTION: smCreate - * * Creates a new memory block with name memName and size memSize. * ! * PRE-Condition: OS does not know memName; memSize > 0 ! * ! * POST-Condition: memName exists with size memSize; ! * memH refers to new memory block. ! * ! * IN: memName ! * Name of new memory block ! * IN: memSize ! * Size of new memory block ! * ! * OUT: memH ! * Handle to new memory block ! * ! * RETURN: SML_ERR_OK, if O.K. ! * SML_ERR_WRONG_USAGE, if memName is already known to the OS ! * SML_ERR_INVALID_SIZE, if memSize <= 0 ! * SML_ERR_NOT_ENOUGH_SPACE, if available memory < memSize ! * ! * @see smDestroy */ Ret_t smCreate (String_t memName, MemSize_t memSize, MemHandle_t *memH) { --- 196,219 ---- /** * Creates a new memory block with name memName and size memSize. * ! * @pre ! * - OS does not know memName ! * - memSize > 0 ! * @post ! * - memName exists with size memSize ! * - memH refers to new memory block. ! * @param memName (IN) ! * Name of new memory block ! * @param memSize (IN) ! * Size of new memory block ! * @param memH (OUT) ! * Handle to new memory block ! * @return ! * - SML_ERR_OK, if O.K. ! * - SML_ERR_WRONG_USAGE, if memName is already known to the OS ! * - SML_ERR_INVALID_SIZE, if memSize <= 0 ! * - SML_ERR_NOT_ENOUGH_SPACE, if available memory < memSize ! * @see smDestroy */ Ret_t smCreate (String_t memName, MemSize_t memSize, MemHandle_t *memH) { *************** *** 251,273 **** /** - * FUNCTION: smOpen - * * Open connection to memory block with name memName. * ! * PRE-Condition: OS does know memName ! * ! * POST-Condition: memH refers to memory block memName ! * ! * IN: memName ! * Name of memory block to open<BR> ! * Windows version: Name is ignored ! * ! * OUT: memH ! * Handle to opened memory block ! * ! * RETURN: SML_ERR_OK, if O.K. ! * SML_ERR_WRONG_PARAM, if memName is unknown ! * ! * @see smClose */ Ret_t smOpen (String_t memName, MemHandle_t *memH) { --- 250,266 ---- /** * Open connection to memory block with name memName. * ! * @pre OS does know memName ! * @post memH refers to memory block memName ! * @param memName (IN) ! * Name of memory block to open\n ! * Windows version: Name is ignored ! * @param memH (OUT) ! * Handle to opened memory block ! * @return ! * - SML_ERR_OK, if O.K. ! * - SML_ERR_WRONG_PARAM, if memName is unknown ! * @see smClose */ Ret_t smOpen (String_t memName, MemHandle_t *memH) { *************** *** 284,303 **** /** - * FUNCTION: smClose - * * Close link to memory block. * ! * PRE-Condition: memH is a valid memory block handle; memH is unlocked; ! * no pointers to records are in use ! * ! * POST-Condition: memH is not valid anymore ! * ! * IN: memH ! * Handle to close ! * ! * RETURN: SML_ERR_OK, if O.K. ! * SML_ERR_WRONG_USAGE, if memH is locked or unknown ! * ! * @see smOpen */ Ret_t smClose (MemHandle_t memH) { --- 277,293 ---- /** * Close link to memory block. * ! * @pre ! * - memH is a valid memory block handle ! * - memH is unlocked ! * - no pointers to records are in use ! * @post memH is not valid anymore ! * @param memH (IN) ! * Handle to close ! * @return ! * - SML_ERR_OK, if O.K. ! * - SML_ERR_WRONG_USAGE, if memH is locked or unknown ! * @see smOpen */ Ret_t smClose (MemHandle_t memH) { *************** *** 319,340 **** /** - * FUNCTION: smDestroy - * * Remove memory block memName within OS. * ! * PRE-Condition: memName is a valid memory block name; ! * memory block is not in use (i.e. no handles and ! * pointers to this memory block are in use) ! * ! * POST-Condition: memName is not a valid memory block name anymore ! * ! * IN: memName ! * Name of memory block to remove ! * ! * RETURN: SML_ERR_OK, if O.K. ! * SML_ERR_WRONG_PARAM, if memName is unknown ! * SML_ERR_WRONG_USAGE, if memory block is still locked ! * ! * @see smCreate */ Ret_t smDestroy (String_t memName) { --- 309,326 ---- /** * Remove memory block memName within OS. * ! * @pre ! * - memName is a valid memory block name ! * - memory block is not in use (i.e. no handles and ! * pointers to this memory block are in use) ! * @post memName is not a valid memory block name anymore ! * @param memName (IN) ! * Name of memory block to remove ! * @return ! * - SML_ERR_OK, if O.K. ! * - SML_ERR_WRONG_PARAM, if memName is unknown ! * - SML_ERR_WRONG_USAGE, if memory block is still locked ! * @see smCreate */ Ret_t smDestroy (String_t memName) { *************** *** 356,380 **** /** - * FUNCTION: smLock - * * Map memory block memH to local address space. * ! * PRE-Condition: memH is a valid handle; memory block is not locked ! * ! * POST-Condition: pMem points to memory block memH; ! * memory block is locked ! * ! * IN: memH ! * Handle to memory block ! * ! * OUT: pMem ! * Pointer to memory block memH mapped in local address space ! * ! * RETURN: SML_ERR_OK, if O.K. ! * SML_ERR_WRONG_PARAM, if memH is unknown ! * SML_ERR_WRONG_USAGE, if memH was already locked ! * SML_ERR_UNSPECIFIC, if lock failed ! * ! * @see smUnlock */ Ret_t smLock (MemHandle_t memH, MemPtr_t *pMem) { --- 342,363 ---- /** * Map memory block memH to local address space. * ! * @pre ! * - memH is a valid handle ! * - memory block is not locked ! * @post ! * - pMem points to memory block memH ! * - memory block is locked ! * @param memH (IN) ! * Handle to memory block ! * @param pMem (OUT) ! * Pointer to memory block memH mapped in local address space ! * @return ! * - SML_ERR_OK, if O.K. ! * - SML_ERR_WRONG_PARAM, if memH is unknown ! * - SML_ERR_WRONG_USAGE, if memH was already locked ! * - SML_ERR_UNSPECIFIC, if lock failed ! * @see smUnlock */ Ret_t smLock (MemHandle_t memH, MemPtr_t *pMem) { *************** *** 396,416 **** /** - * FUNCTION: smUnlock - * * Free pointer mapped to memH memory block. * ! * PRE-Condition: memH is a valid handle; memory block is locked ! * ! * POST-Condition: memory block is unlocked ! * ! * IN: memH ! * Handle to memory block ! * ! * RETURN: SML_ERR_OK, if O.K. ! * SML_ERR_WRONG_PARAM, if memH is unknown ! * SML_ERR_WRONG_USAGE, if memH was already unlocked ! * SML_ERR_UNSPECIFIC, if unlock failed ! * ! * @see smLock */ Ret_t smUnlock (MemHandle_t memH) { --- 379,396 ---- /** * Free pointer mapped to memH memory block. * ! * @pre ! * - memH is a valid handle ! * - memory block is locked ! * @post memory block is unlocked ! * @param memH (IN) ! * Handle to memory block ! * @return ! * - SML_ERR_OK, if O.K. ! * - SML_ERR_WRONG_PARAM, if memH is unknown ! * - SML_ERR_WRONG_USAGE, if memH was already unlocked ! * - SML_ERR_UNSPECIFIC, if unlock failed ! * @see smLock */ Ret_t smUnlock (MemHandle_t memH) { *************** *** 431,455 **** /** - * FUNCTION: smSetSize - * * Set size of memory block memH to newSize. * ! * PRE-Condition: memH is a valid handle; newSize > 0; ! * memory block is unlocked ! * ! * POST-Condition: memory block size = newSize ! * ! * IN: memH ! * Handle to memory block ! * IN: newSize ! * New size of memory block ! * ! * RETURN: SML_ERR_OK, if O.K. ! * SML_ERR_WRONG_PARAM, if memH is unknown ! * SML_ERR_WRONG_USAGE, if memH is locked ! * SML_ERR_INVALID_SIZE, if newSize <= 0 ! * SML_ERR_NOT_ENOUGH_SPACE, if available memory < newSize ! * ! * @see smGetSize */ Ret_t smSetSize (MemHandle_t memH, MemSize_t newSize) { --- 411,432 ---- /** * Set size of memory block memH to newSize. * ! * @pre ! * - memH is a valid handle ! * - newSize > 0 ! * - memory block is unlocked ! * @post memory block size = newSize ! * @param memH (IN) ! * Handle to memory block ! * @param newSize (IN) ! * New size of memory block ! * @return ! * - SML_ERR_OK, if O.K. ! * - SML_ERR_WRONG_PARAM, if memH is unknown ! * - SML_ERR_WRONG_USAGE, if memH is locked ! * - SML_ERR_INVALID_SIZE, if newSize <= 0 ! * - SML_ERR_NOT_ENOUGH_SPACE, if available memory < newSize ! * @see smGetSize */ Ret_t smSetSize (MemHandle_t memH, MemSize_t newSize) { *************** *** 477,498 **** /** - * FUNCTION: smGetSize - * * Get size of memory block memH. * ! * PRE-Condition: memH is a valid handle ! * ! * POST-Condition: actSize = memory block size ! * ! * IN: memH ! * Handle to memory block ! * ! * OUT: actSize ! * Actual size of memory block ! * ! * RETURN: SML_ERR_OK, if O.K. ! * SML_ERR_WRONG_PARAM, if memH is unknown ! * ! * @see smSetSize */ Ret_t smGetSize (MemHandle_t memH, MemSize_t *actSize) { --- 454,469 ---- /** * Get size of memory block memH. * ! * @pre memH is a valid handle ! * @post actSize = memory block size ! * @param memH (IN) ! * Handle to memory block ! * @param actSize (OUT) ! * Actual size of memory block ! * @return ! * - SML_ERR_OK, if O.K. ! * - SML_ERR_WRONG_PARAM, if memH is unknown ! * @see smSetSize */ Ret_t smGetSize (MemHandle_t memH, MemSize_t *actSize) { |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:33
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/wsm/all In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/sml/wsm/all Modified Files: wsm.c Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: wsm.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/wsm/all/wsm.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wsm.c 14 Nov 2003 09:52:08 -0000 1.3 --- wsm.c 24 May 2004 01:33:38 -0000 1.4 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: SyncML WorkSpace Manager */ ! /* file: WSM.c */ ! /* target system: All */ ! /* target OS: All */ ! /*************************************************************************/ --- 1,11 ---- ! /** [...998 lines suppressed...] Ret_t wsmReset (MemHandle_t wsmH) { wsmBuf[0].pFirstFree = wsmBuf[0].pFirstFree - wsmBuf[0].usedBytes ; --- 1229,1234 ---- return wsmRet=SML_ERR_OK; } + Ret_t wsmReset (MemHandle_t wsmH) { wsmBuf[0].pFirstFree = wsmBuf[0].pFirstFree - wsmBuf[0].usedBytes ; *************** *** 1595,1598 **** #endif // #ifndef __SML_LITE__ ! #endif // #idndef NOWSM --- 1242,1245 ---- #endif // #ifndef __SML_LITE__ ! #endif // #ifndef NOWSM |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:28
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/sml/xlt/all Modified Files: xltdec.c xltdeccom.h xltdecwbxml.c xltdecwbxml.h xltdecxml.c xltdevinf.c xltdevinf.h xltenc.c xltenccom.c xltenccom.h xltencwbxml.c xltencwbxml.h xltencxml.c xltencxml.h xltmetinf.c xltmetinf.h xlttags.c xlttags.h xlttagtbl.h xltutilstack.c xltutilstack.h Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: xltenccom.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltenccom.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xltenccom.c 14 Aug 2003 12:48:42 -0000 1.3 --- xltenccom.c 24 May 2004 01:33:39 -0000 1.4 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: Encoder utils file */ ! /* file: xltenccom.c */ ! /* target system: All */ ! /* target OS: All */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * Encoder utils file ! * ! * @target_system All ! * @target_os All ! */ /* *************** *** 53,72 **** /** - * FUNCTION: xltAddToBuffer - * * Add a string to the global buffer * ! * PRE-Condition: pContent contains some content bytes to write to the (WB) XML buffer ! * ! * POST-Condition: content is written to the buffer ! * ! * IN: pContent, the character pointer referencing the content to ! * write to the buffer ! * size, the content length ! * ! * IN/OUT: pBufMgr, pointer to a structure containing buffer management elements ! * ! * RETURN: shows error codes of function, ! * 0, if OK */ Ret_t xltAddToBuffer(const MemPtr_t pContent, MemSize_t size, BufferMgmtPtr_t pBufMgr) --- 54,69 ---- /** * Add a string to the global buffer * ! * @pre pContent contains some content bytes to write to the (WB) XML buffer ! * @post content is written to the buffer ! * @param pContent (IN) ! * the character pointer referencing the content to write to the buffer ! * @param size (IN) ! * the content length ! * @param pBufMgr (IN/OUT) ! * pointer to a structure containing buffer management elements ! * @return shows error codes of function,\n ! * 0, if OK */ Ret_t xltAddToBuffer(const MemPtr_t pContent, MemSize_t size, BufferMgmtPtr_t pBufMgr) Index: xltdevinf.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltdevinf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xltdevinf.h 6 Aug 2002 20:42:51 -0000 1.1 --- xltdevinf.h 24 May 2004 01:33:39 -0000 1.2 *************** *** 1,9 **** ! /*************************************************************************/ ! /* module: Definition of DevInf DTD prototypefunctions */ ! /* for the en-/decoder */ ! /* file: xltdevinf.h */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * Definition of DevInf DTD prototypefunctions for the en-/decoder ! * ! * @target_system all ! * @target_os all ! */ /* Index: xltdecwbxml.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltdecwbxml.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xltdecwbxml.c 14 Nov 2003 09:43:26 -0000 1.3 --- xltdecwbxml.c 24 May 2004 01:33:39 -0000 1.4 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: WBXML decoder */ ! /* file: XLTDecWbxml.c */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ /* --- 1,11 ---- ! /** ! * @file ! * WBXML decoder ! * ! * @target_system all ! * @target_os all ! * @description The WBXML scanner/tokenizer. Used by the SyncML parser. ! */ ! /* *************** *** 42,49 **** */ - /** - * The WBXML scanner/tokenizer. Used by the SyncML parser. - */ - #include "syncml_tk_prefix_file.h" // %%% luz: needed for precompiled headers in eVC++ --- 45,48 ---- *************** *** 108,111 **** --- 107,112 ---- + /** @copydoc wbxmlScannerPriv_s */ + typedef struct wbxmlScannerPriv_s wbxmlScannerPriv_t, *wbxmlScannerPrivPtr_t; /** * Private Interface for the WBXML scanner. *************** *** 116,120 **** * scanner module. */ - typedef struct wbxmlScannerPriv_s wbxmlScannerPriv_t, *wbxmlScannerPrivPtr_t; struct wbxmlScannerPriv_s { --- 117,120 ---- *************** *** 127,156 **** /* public attributes */ ! XltDecTokenPtr_t curtok; /* current token */ ! Long_t charset; /* character set as specified in the WBXML header */ ! String_t charsetStr; /* NULL */ ! Long_t pubID; /* document public identifier as specified in the WBXML header */ ! String_t pubIDStr; /* pubID as a string - valid only when pubID == 0 */ ! Flag_t finished; /* set when end of buffer is reached */ /* private attributes */ ! MemPtr_t pos; /* current buffer position */ ! MemPtr_t bufend; /* end of buffer */ ! Long_t pubIDIdx; /* strtbl index of the string version of the pubID - valid only when pubID == 0 */ ! XltUtilStackPtr_t tagstack; /* stack of open start tags */ ! MemPtr_t strtbl; /* copy of the string table */ ! Long_t strtbllen; /* length of the string table */ ! Byte_t state; /* tag state or attribute state */ ! SmlPcdataExtension_t cptag; /* current codepage for tags */ ! Byte_t cpattr; /* current codepage for attributes */ ! SmlPcdataExtension_t activeExt; /* the active Sub DTD */ }; --- 127,156 ---- /* public attributes */ ! XltDecTokenPtr_t curtok; /**< current token */ ! Long_t charset; /**< character set as specified in the WBXML header */ ! String_t charsetStr; /**< NULL */ ! Long_t pubID; /**< document public identifier as specified in the WBXML header */ ! String_t pubIDStr; /**< pubID as a string - valid only when pubID == 0 */ ! Flag_t finished; /**< set when end of buffer is reached */ /* private attributes */ ! MemPtr_t pos; /**< current buffer position */ ! MemPtr_t bufend; /**< end of buffer */ ! Long_t pubIDIdx; /**< strtbl index of the string version of the pubID - valid only when pubID == 0 */ ! XltUtilStackPtr_t tagstack; /**< stack of open start tags */ ! MemPtr_t strtbl; /**< copy of the string table */ ! Long_t strtbllen; /**< length of the string table */ ! Byte_t state; /**< tag state or attribute state */ ! SmlPcdataExtension_t cptag; /**< current codepage for tags */ ! Byte_t cpattr; /**< current codepage for attributes */ ! SmlPcdataExtension_t activeExt; /**< the active Sub DTD */ }; *************** *** 159,163 **** typedef Long_t MBINT; ! /** * Public methods of the scanner interface. * --- 159,163 ---- typedef Long_t MBINT; ! /* * Public methods of the scanner interface. * *************** *** 171,200 **** /** - * FUNCTION: readBytes - * * Advance the current position pointer after checking whether the end of * the buffer has been reached. If the end of the buffer has been reached * the scanner's finished flag is set. ! ! * RETURNS: 0, if end of buffer has been reached ! * 1 otherwise */ static Boolean_t readBytes(wbxmlScannerPrivPtr_t pScanner, Long_t bytes); /** - * FUNCTION: parseInt - * * Decodes multi-byte integers. * ! * PRE-Condition: ! * pScanner->pos points to the first byte of the mb_int. ! * ! * POST-Condition: ! * pScanner->pos points to the last byte of the mb_int. */ static Ret_t parseInt(wbxmlScannerPrivPtr_t pScanner, MBINT *mbi); /** ! * FUNCTION: wbxmlHeader, wbxmlVersion, wbxmlPublicID, wbxmlCharset * * These functions are used for decoding the WBXML document header. --- 171,193 ---- /** * Advance the current position pointer after checking whether the end of * the buffer has been reached. If the end of the buffer has been reached * the scanner's finished flag is set. ! * ! * @return 0, if end of buffer has been reached ! * 1 otherwise */ static Boolean_t readBytes(wbxmlScannerPrivPtr_t pScanner, Long_t bytes); /** * Decodes multi-byte integers. * ! * @pre pScanner->pos points to the first byte of the mb_int. ! * @post pScanner->pos points to the last byte of the mb_int. */ static Ret_t parseInt(wbxmlScannerPrivPtr_t pScanner, MBINT *mbi); /** ! * wbxmlHeader, wbxmlVersion, wbxmlPublicID, wbxmlCharset * * These functions are used for decoding the WBXML document header. *************** *** 210,215 **** /** - * FUNCTION: wbxmlSwitchPage - * * Switch WBXML code page */ --- 203,206 ---- *************** *** 217,234 **** /** ! * FUNCTION: wbxmlXXXToken * * Scan the document for the next valid XML/WBXML token as defined in the * XLTDecCom header file (e.g. TOK_TAG_START). * ! * PRE-Condition: ! * pScanner->pos points to the first byte of a valid WBXML ! * element (String, Tag, etc.) ! * ! * POST-Condition: ! * pScanner->pos points to the last byte of the WBXML ! * element; ! * pScanner->curtok contains type and tagid or pcdata of ! * the token */ static Ret_t wbxmlStringToken(wbxmlScannerPrivPtr_t pScanner); --- 208,220 ---- /** ! * wbxmlXXXToken * * Scan the document for the next valid XML/WBXML token as defined in the * XLTDecCom header file (e.g. TOK_TAG_START). * ! * @pre pScanner->pos points to the first byte of a valid WBXML ! * element (String, Tag, etc.) ! * @post pScanner->pos points to the last byte of the WBXML element; ! * pScanner->curtok contains type and tagid or pcdata of the token */ static Ret_t wbxmlStringToken(wbxmlScannerPrivPtr_t pScanner); *************** *** 237,241 **** /** ! * FUNCTION: wbxmlXXXToken * * WBXML extensions, entities, processing instructions and attributes are --- 223,227 ---- /** ! * wbxmlSkipXXX * * WBXML extensions, entities, processing instructions and attributes are *************** *** 252,258 **** /*************************************************************************/ ! /** ! * FUNCTION: XltDecWbxmlInit ! * * Create and initialize a new WBXML scanner. Description see XLTDec.h. */ --- 238,242 ---- /*************************************************************************/ ! /* * Create and initialize a new WBXML scanner. Description see XLTDec.h. */ *************** *** 304,309 **** /** - * FUNCTION: destroy - * * Free memory. Description see XltDecAll.h. */ --- 288,291 ---- *************** *** 327,332 **** /** - * FUNCTION: nextTok - * * Get next token. */ --- 309,312 ---- *************** *** 370,375 **** /** - * FUNCTION: pushTok - * * Reset the scanner to the starting position of the current token within * the buffer. --- 350,353 ---- *************** *** 429,435 **** /*************************************************************************/ ! /** ! * FUNCTION: readBytes ! * * Advance the position pointer. Description see above. */ --- 407,411 ---- /*************************************************************************/ ! /* * Advance the position pointer. Description see above. */ *************** *** 445,449 **** } ! /** * NOTICE: Entities, Extensions, Processing Instructions and Attributes * are not supported by the WBXML scanner. --- 421,425 ---- } ! /* * NOTICE: Entities, Extensions, Processing Instructions and Attributes * are not supported by the WBXML scanner. *************** *** 456,462 **** */ ! /** ! * FUNCTION: wbxmlHeader ! * * Decode the WBXML header containing version number, document public * identifier, character set and a string table. --- 432,436 ---- */ ! /* * Decode the WBXML header containing version number, document public * identifier, character set and a string table. *************** *** 480,485 **** /** - * FUNCTION: wbxmlVersion - * * Decode WBXML version. The scanner returns an error if the major version * of the document differs from the major version this scanner supports or --- 454,457 ---- *************** *** 507,512 **** /** - * FUNCTION: wbxmlPublicID - * * Decodes WBXML Document Public Identifier. */ --- 479,482 ---- *************** *** 540,545 **** /** - * FUNCTION: wbxmlCharset - * * Decode WBXML Charset. */ --- 510,513 ---- *************** *** 564,569 **** /** - * FUNCTION: wbxmlStrtbl - * * Keep a copy of the string table. */ --- 532,535 ---- *************** *** 810,816 **** } ! /** ! * FUNCTION: wbxmlSwitchPage ! * * Switch WBXML code page. */ --- 776,780 ---- } ! /* * Switch WBXML code page. */ *************** *** 849,854 **** /** - * FUNCTION: wbxmlSkipEntity - * * Skips entities but doesn't do anything useful yet. */ --- 813,816 ---- *************** *** 870,876 **** ! /** ! * FUNCTION: wbxmlSkipExtension ! * * Decode WBXML extensions. Skips the extension but doesn't do anything * useful with it. --- 832,836 ---- ! /* * Decode WBXML extensions. Skips the extension but doesn't do anything * useful with it. *************** *** 904,910 **** } ! /** ! * FUNCTION: wbxmlSkipPI ! * * Handle XML processing instructions. PIs are not supported but the * scanner recognizes and skips over them. --- 864,868 ---- } ! /* * Handle XML processing instructions. PIs are not supported but the * scanner recognizes and skips over them. *************** *** 918,924 **** } ! /** ! * FUNCTION: wbxmlSkipAttribute ! * * Handle attributes. Attributes are not supported but the * scanner recognizes and skips over them. --- 876,880 ---- } ! /* * Handle attributes. Attributes are not supported but the * scanner recognizes and skips over them. Index: xltenc.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltenc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** xltenc.c 24 Nov 2003 13:53:49 -0000 1.5 --- xltenc.c 24 May 2004 01:33:39 -0000 1.6 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: Encoder source file */ ! /* file: xltenc.c */ ! /* target system: All */ ! /* target OS: All */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * Encoder source file ! * ! * @target_system All ! * @target_os All ! */ /* *************** *** 147,183 **** /** - * FUNCTION: smlXltEncInit - * * Initializes an XML buffer; Creates XML code for the SyncHdr * and appends it to the buffer. * Returns 0 if operation was successful. * ! * PRE-Condition: no memory should be allocated for ppEncoder (should be NULL) ! * pHeader has to contain a valid SyncHdr structure ! * pBufEnd must point to the end of the (WB)XML buffer ! * ppBufPos has to be initialized to the start point of the ! * (WB)XML buffer. ! * ! * ! * POST-Condition: After the function call ppBufPos points to the ! * first free byte in the buffer behind the (WB)XML document ! * ! * IN: enc, the encoding constant (SML_WBXML or SML_XML) ! * pHeader, the SyncML header structure ! * pBufEnd, pointer to the end of the buffer to write on ! * ! * IN/OUT: ppBufPos, current position of the bufferpointer ! * ppEncoder, the encoder object ! * ! * RETURN: shows error codes of function, ! * 0, if OK ! * Possible Error Codes: ! * SML_ERR_XLT_MISSING_CONT ! * SML_ERR_XLT_BUF_ERR ! * SML_ERR_XLT_INVAL_ELEM_TYPE ! * SML_ERR_XLT_INVAL_LIST_TYPE ! * SML_ERR_XLT_INVAL_TAG_TYPE ! * SML_ERR_XLT_ENC_UNK ! * SML_ERR_XLT_INVAL_PROTO_ELEM */ Ret_t xltEncInit(SmlEncoding_t enc, --- 148,184 ---- /** * Initializes an XML buffer; Creates XML code for the SyncHdr * and appends it to the buffer. * Returns 0 if operation was successful. * ! * @pre no memory should be allocated for ppEncoder (should be NULL) ! * pHeader has to contain a valid SyncHdr structure ! * pBufEnd must point to the end of the (WB)XML buffer ! * ppBufPos has to be initialized to the start point of the ! * (WB)XML buffer. ! * @post After the function call ppBufPos points to the ! * first free byte in the buffer behind the (WB)XML document ! * @param enc (IN) ! * the encoding constant (SML_WBXML or SML_XML) ! * @param pHeader (IN) ! * the SyncML header structure ! * @param pBufEnd (IN) ! * pointer to the end of the buffer to write on ! * @param ppBufPos (IN/OUT) ! * current position of the bufferpointer ! * @param ppEncoder (IN/OUT) ! * the encoder object ! * @param vers (IN) ! * SyncML version ! * @return shows error codes of function,\n ! * 0, if OK\n ! * Possible Error Codes: ! * - SML_ERR_XLT_MISSING_CONT ! * - SML_ERR_XLT_BUF_ERR ! * - SML_ERR_XLT_INVAL_ELEM_TYPE ! * - SML_ERR_XLT_INVAL_LIST_TYPE ! * - SML_ERR_XLT_INVAL_TAG_TYPE ! * - SML_ERR_XLT_ENC_UNK ! * - SML_ERR_XLT_INVAL_PROTO_ELEM */ Ret_t xltEncInit(SmlEncoding_t enc, *************** *** 344,379 **** /** - * FUNCTION: smlXltEncAppend - * * Generates (WB)XML code and appends it to the XML buffer. * ! * PRE-Condition: pEncoder holds the initialized encoder structure. ! * the initialization takes place in the xltEncAppend function ! * pContent has to contain a valid content structure structure ! * pBufEnd must point to the end of the (WB)XML buffer ! * ppBufPos has to be initialized to the start point of the ! * (WB)XML buffer. ! * ! * ! * POST-Condition: After the function call ppBufPos points to the ! * first free byte in the buffer behind the (WB)XML document ! * ! * IN: pEncoder, the encoder object ! * pe, the protocol element (PE_ADD, ...) ! * pBufEnd, pointer to the end of the buffer to write on ! * pContent, the content to append to the SyncML document ! * ! * IN/OUT: ppBufPos, current position of the bufferpointer ! * ! * RETURN: shows error codes of function, ! * 0, if OK ! * Possible Error Codes: ! * SML_ERR_XLT_MISSING_CONT ! * SML_ERR_XLT_BUF_ERR ! * SML_ERR_XLT_INVAL_ELEM_TYPE ! * SML_ERR_XLT_INVAL_LIST_TYPE ! * SML_ERR_XLT_INVAL_TAG_TYPE ! * SML_ERR_XLT_ENC_UNK ! * SML_ERR_XLT_INVAL_PROTO_ELEM */ Ret_t xltEncAppend(const XltEncoderPtr_t pEncoder, --- 345,378 ---- /** * Generates (WB)XML code and appends it to the XML buffer. * ! * @pre pEncoder holds the initialized encoder structure. ! * the initialization takes place in the xltEncAppend function ! * pContent has to contain a valid content structure structure ! * pBufEnd must point to the end of the (WB)XML buffer ! * ppBufPos has to be initialized to the start point of the ! * (WB)XML buffer. ! * @post After the function call ppBufPos points to the ! * first free byte in the buffer behind the (WB)XML document ! * @param pEncoder (IN) ! * the encoder object ! * @param pe (IN) ! * the protocol element (PE_ADD, ...) ! * @param pBufEnd (IN) ! * pointer to the end of the buffer to write on ! * @param pContent (IN) ! * the content to append to the SyncML document ! * @param ppBufPos (IN/OUT) ! * current position of the bufferpointer ! * @return shows error codes of function,\n ! * 0, if OK\n ! * Possible Error Codes: ! * - SML_ERR_XLT_MISSING_CONT ! * - SML_ERR_XLT_BUF_ERR ! * - SML_ERR_XLT_INVAL_ELEM_TYPE ! * - SML_ERR_XLT_INVAL_LIST_TYPE ! * - SML_ERR_XLT_INVAL_TAG_TYPE ! * - SML_ERR_XLT_ENC_UNK ! * - SML_ERR_XLT_INVAL_PROTO_ELEM */ Ret_t xltEncAppend(const XltEncoderPtr_t pEncoder, *************** *** 455,487 **** /** - * FUNCTION: smlXltEncTerminate - * * Filnalizes the (WB)XML document and returns the size of written bytes to * the workspace module * ! * PRE-Condition: pEncoder holds the initialized encoder structure. ! * the initialization takes place in the xltEncAppend function ! * pBufEnd must point to the end of the (WB)XML buffer ! * ppBufPos has to be initialized to the start point of the ! * (WB)XML buffer. ! * ! * POST-Condition: After the function call ppBufPos points to the ! * first free byte in the buffer behind the (WB)XML document ! * ! * IN: pEncoder, the encoder object ! * pBufEnd, pointer to the end of the buffer to write on ! * ! * IN/OUT: ppBufPos, current position of the bufferpointer ! * ! * RETURN: shows error codes of function, ! * 0, if OK ! * Possible Error Codes: ! * SML_ERR_XLT_BUF_ERR ! * SML_ERR_XLT_MISSING_CONT ! * SML_ERR_XLT_INVAL_ELEM_TYPE ! * SML_ERR_XLT_INVAL_LIST_TYPE ! * SML_ERR_XLT_INVAL_TAG_TYPE ! * SML_ERR_XLT_ENC_UNK ! * SML_ERR_XLT_INVAL_PROTO_ELEM */ Ret_t xltEncTerminate(const XltEncoderPtr_t pEncoder, --- 454,483 ---- /** * Filnalizes the (WB)XML document and returns the size of written bytes to * the workspace module * ! * @pre pEncoder holds the initialized encoder structure. ! * the initialization takes place in the xltEncAppend function ! * pBufEnd must point to the end of the (WB)XML buffer ! * ppBufPos has to be initialized to the start point of the ! * (WB)XML buffer. ! * @post After the function call ppBufPos points to the ! * first free byte in the buffer behind the (WB)XML document ! * @param pEncoder (IN) ! * the encoder object ! * @param pBufEnd (IN) ! * pointer to the end of the buffer to write on ! * @param ppBufPos (IN/OUT) ! * current position of the bufferpointer ! * @return shows error codes of function,\n ! * 0, if OK\n ! * Possible Error Codes: ! * - SML_ERR_XLT_BUF_ERR ! * - SML_ERR_XLT_MISSING_CONT ! * - SML_ERR_XLT_INVAL_ELEM_TYPE ! * - SML_ERR_XLT_INVAL_LIST_TYPE ! * - SML_ERR_XLT_INVAL_TAG_TYPE ! * - SML_ERR_XLT_ENC_UNK ! * - SML_ERR_XLT_INVAL_PROTO_ELEM */ Ret_t xltEncTerminate(const XltEncoderPtr_t pEncoder, *************** *** 570,584 **** /** - * FUNCTION: smlXltStartEvaluation - * * Starts an evaluation run which prevents further API-Calls to write tags - * just the tag-sizes are calculated. Must be sopped via smlEndEvaluation * ! * IN: XltEncoderPtr_t ! * the encoder object ! * ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t xltStartEvaluation(XltEncoderPtr_t pEncoder) --- 566,575 ---- /** * Starts an evaluation run which prevents further API-Calls to write tags - * just the tag-sizes are calculated. Must be sopped via smlEndEvaluation * ! * @param pEncoder (IN) ! * the encoder object ! * @return Return Code */ SML_API Ret_t xltStartEvaluation(XltEncoderPtr_t pEncoder) *************** *** 602,618 **** /** - * FUNCTION: smlXltEndEvaluation - * * Stops an evaluation run which prevents further API-Calls to write tags - * the remaining free buffer size after all Tags are written is returned * ! * IN: XltEncoderPtr_t ! * the encoder object ! * ! * IN/OUT: MemSize_t ! * Size of free buffer for data after all tags are written ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t xltEndEvaluation(InstanceID_t id, XltEncoderPtr_t pEncoder, MemSize_t *freemem) --- 593,606 ---- /** * Stops an evaluation run which prevents further API-Calls to write tags - * the remaining free buffer size after all Tags are written is returned * ! * @param id (IN) ! * instance ID ! * @param pEncoder (IN) ! * the encoder object ! * @param freemem (IN/OUT) ! * Size of free buffer for data after all tags are written ! * @return Return Code */ SML_API Ret_t xltEndEvaluation(InstanceID_t id, XltEncoderPtr_t pEncoder, MemSize_t *freemem) *************** *** 642,665 **** /** - * FUNCTION: xltEncBlock - * * Generates a (WB)XML Block for a given tag ID and a given content * ! * PRE-Condition: pContent holds a valid content structure ! * tagId contains a valid SyncML tag ID ! * ! * POST-Condition: the (WB)XML buffer in the pBufMgr structure contains the ! * encoded (WB)XML block ! * ! * IN: tagId, the ID for the tag to generate (TN_ADD, ...) ! * reqOptFlag, flag if the block is required or optional ! * pContent, the content structure of the block ! * enc, the encoding constant (SML_WBXML or SML_XML) ! * attFlag, indicates if the encoded tag contain Attributes in namespace extensions ! * ! * IN/OUT: pBufMgr, pointer to a structure containing buffer management elements ! * ! * RETURN: shows error codes of function, ! * 0, if OK */ Ret_t xltEncBlock(XltTagID_t tagId, XltRO_t reqOptFlag, const VoidPtr_t pContent, SmlEncoding_t enc, BufferMgmtPtr_t pBufMgr, SmlPcdataExtension_t attFlag) --- 630,654 ---- /** * Generates a (WB)XML Block for a given tag ID and a given content * ! * @pre pContent holds a valid content structure ! * tagId contains a valid SyncML tag ID ! * @post the (WB)XML buffer in the pBufMgr structure contains the ! * encoded (WB)XML block ! * @param tagId (IN) ! * the ID for the tag to generate (TN_ADD, ...) ! * @param reqOptFlag (IN) ! * flag if the block is required or optional ! * @param pContent (IN) ! * the content structure of the block ! * @param enc (IN) ! * the encoding constant (SML_WBXML or SML_XML) ! * @param attFlag (IN) ! * indicates if the encoded tag contain Attributes ! * in namespace extensions ! * @param pBufMgr (IN/OUT) ! * pointer to a structure containing buffer management elements ! * @return shows error codes of function,\n ! * 0, if OK */ Ret_t xltEncBlock(XltTagID_t tagId, XltRO_t reqOptFlag, const VoidPtr_t pContent, SmlEncoding_t enc, BufferMgmtPtr_t pBufMgr, SmlPcdataExtension_t attFlag) *************** *** 1165,1187 **** /** - * FUNCTION: xltEncList - * * Generates a list element which is not directly related to a tag * ! * PRE-Condition: pList holds a valid list structure ! * listId contains a valid SyncML list ID ! * ! * POST-Condition: the (WB)XML buffer in the pBufMgr structure contains the ! * encoded (WB)XML list ! * ! * IN: listId, the ID of the list to generate (e.g. TARGET_LIST, ...) ! * pList, reference to the list to process ! * enc, the encoding constant (SML_WBXML or SML_XML) ! * attFlag, indicates if the encoded tag contain Attributes in namespace extensions ! * ! * IN/OUT: pBufMgr, pointer to a structure containing buffer management elements ! * ! * RETURN: shows error codes of function, ! * 0, if OK */ Ret_t xltEncList(XltListType_t listId, XltRO_t reqOptFlag, VoidPtr_t pList, SmlEncoding_t enc, BufferMgmtPtr_t pBufMgr, SmlPcdataExtension_t attFlag) --- 1154,1178 ---- /** * Generates a list element which is not directly related to a tag * ! * @pre pList holds a valid list structure ! * listId contains a valid SyncML list ID ! * @post the (WB)XML buffer in the pBufMgr structure contains the ! * encoded (WB)XML list ! * @param listId (IN) ! * the ID of the list to generate (e.g. TARGET_LIST, ...) ! * @param reqOptFlag (IN) ! * flag if the block is required or optional ! * @param pList (IN) ! * reference to the list to process ! * @param enc (IN) ! * the encoding constant (SML_WBXML or SML_XML) ! * @param pBufMgr (IN/OUT) ! * pointer to a structure containing buffer management elements ! * @param attFlag (IN) ! * indicates if the encoded tag contain Attributes ! * in namespace extensions ! * @return shows error codes of function,\n ! * 0, if OK */ Ret_t xltEncList(XltListType_t listId, XltRO_t reqOptFlag, VoidPtr_t pList, SmlEncoding_t enc, BufferMgmtPtr_t pBufMgr, SmlPcdataExtension_t attFlag) *************** *** 1257,1277 **** /** - * FUNCTION: xltGenerateTag - * * Generates a (WB)XML tag * ! * PRE-Condition: valis parameters ! * ! * POST-Condition: the buffer contains a new tag ! * ! * IN: tagId, the tag ID ! * TagType, the tag type (begin tag, end tag, ...) ! * enc, the encoding constant (SML_WBXML or SML_XML) ! * attFlag, indicates if the encoded tag contain Attributes in namespace extensions ! * ! * IN/OUT: pBufMgr, pointer to a structure containing buffer management elements ! * ! * RETURN: shows error codes of function, ! * 0, if OK */ Ret_t xltGenerateTag(XltTagID_t tagId, XltTagType_t TagType, SmlEncoding_t enc, BufferMgmtPtr_t pBufMgr, SmlPcdataExtension_t attFlag) --- 1248,1268 ---- /** * Generates a (WB)XML tag * ! * @pre valid parameters ! * @post the buffer contains a new tag ! * @param tagId (IN) ! * the tag ID ! * @param TagType (IN) ! * the tag type (begin tag, end tag, ...) ! * @param enc (IN) ! * the encoding constant (SML_WBXML or SML_XML) ! * @param attFlag (IN) ! * indicates if the encoded tag contain Attributes ! * in namespace extensions ! * @param pBufMgr (IN/OUT) ! * pointer to a structure containing buffer management elements ! * @return shows error codes of function,\n ! * 0, if OK */ Ret_t xltGenerateTag(XltTagID_t tagId, XltTagType_t TagType, SmlEncoding_t enc, BufferMgmtPtr_t pBufMgr, SmlPcdataExtension_t attFlag) Index: xltdec.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltdec.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** xltdec.c 2 May 2003 22:05:08 -0000 1.2 --- xltdec.c 24 May 2004 01:33:38 -0000 1.3 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: SyncmML Decoder */ ! /* file: XLTDec.c */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ /* --- 1,11 ---- ! /** ! * @file ! * SyncmML Decoder ! * ! * @target_system all ! * @target_os all ! * @description The SyncML parser. ! */ ! /* *************** *** 42,49 **** */ - /** - * The SyncML parser. - */ - /*************************************************************************/ /* Definitions */ --- 45,48 ---- *************** *** 75,80 **** /** - * FUNCTION: concatPCData - * * Tries to concatenate two Pcdata elements. Only works when the two * elements are of the same type (e.g. SML_PCDATA_STRING). Returns a --- 74,77 ---- *************** *** 85,89 **** /** ! * FUNCTION: appendXXXList * * These are auxiliary functions for building SyncML elements that contain --- 82,86 ---- /** ! * appendXXXList * * These are auxiliary functions for building SyncML elements that contain *************** *** 92,110 **** * element at the end. If the ListPtr points to NULL a new list is created. * ! * PRE-Condition: ! * The scanner's current token is the start tag (may be ! * empty) of the SyncML element to be appended to the list. ! * ! * POST-Condition: ! * The scanner's current token is the end tag (or empty ! * start tag) of the SyncML element that was added to the ! * list. ! * ! * IN/OUT: pDecoder, the decoder ! * ppXXXList, NULL or an initialized list, to which element ! * will be appended ! * ! * RETURNS: SML_ERR_OK, if an element was successfully appended ! * else error code */ static Ret_t appendItemList(XltDecoderPtr_t pDecoder, SmlItemListPtr_t *ppItemList); --- 89,102 ---- * element at the end. If the ListPtr points to NULL a new list is created. * ! * @pre The scanner's current token is the start tag (may be ! * empty) of the SyncML element to be appended to the list. ! * @post The scanner's current token is the end tag (or empty ! * start tag) of the SyncML element that was added to the list. ! * @param pDecoder (IN/OUT) ! * the decoder ! * @param ppXXXList (IN/OUT) ! * NULL or an initialized list, to which element will be appended ! * @return SML_ERR_OK, if an element was successfully appended\n ! * else error code */ static Ret_t appendItemList(XltDecoderPtr_t pDecoder, SmlItemListPtr_t *ppItemList); Index: xltdevinf.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltdevinf.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** xltdevinf.c 7 Apr 2004 06:51:06 -0000 1.5 --- xltdevinf.c 24 May 2004 01:33:39 -0000 1.6 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: DeviceInf DTD related functions for the en-/decoder */ ! /* file: xltdevinf.c */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * DeviceInf DTD related functions for the en-/decoder ! * ! * @target_system all ! * @target_os all ! */ /* Index: xltenccom.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltenccom.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xltenccom.h 14 Aug 2003 12:48:42 -0000 1.3 --- xltenccom.h 24 May 2004 01:33:39 -0000 1.4 *************** *** 1,2 **** --- 1,10 ---- + /** + * @file + * Encoder utils header file + * + * @target_system All + * @target_os All + */ + /* * Copyright Notice *************** *** 52,56 **** #endif ! // flags if a (WB)XML block is required or optional typedef enum { OPTIONAL = 0, --- 60,64 ---- #endif ! /** flags if a (WB)XML block is required or optional */ typedef enum { OPTIONAL = 0, *************** *** 58,63 **** } XltRO_t; ! /* Tag Types (TT) - begin tags, end tags, ... ! */ typedef enum { TT_END = 0, --- 66,70 ---- } XltRO_t; ! /** Tag Types (TT) - begin tags, end tags, ... */ typedef enum { TT_END = 0, *************** *** 66,71 **** } XltTagType_t; ! /* Structure elements which are not directly relied to a tag ! */ typedef enum { ITEM_LIST, --- 73,77 ---- } XltTagType_t; ! /** Structure elements which are not directly relied to a tag */ typedef enum { ITEM_LIST, *************** *** 78,82 **** } XltListType_t; ! // Type for storing free mem size evaluation information typedef struct XltSpaceEvaluation_s { --- 84,88 ---- } XltListType_t; ! /** Type for storing free mem size evaluation information */ typedef struct XltSpaceEvaluation_s { *************** *** 106,127 **** } BufferMgmt_t, *BufferMgmtPtr_t; - /** - * FUNCTION: xltAddToBuffer - * - * Add a string to the global buffer - * - * PRE-Condition: pContent contains some content bytes to write to the (WB) XML buffer - * - * POST-Condition: content is written to the buffer - * - * IN: pContent, the character pointer referencing the content to - * write to the buffer - * size, the content length - * - * IN/OUT: pBufMgr, pointer to a structure containing buffer management elements - * - * RETURN: shows error codes of function, - * 0, if OK - */ Ret_t xltAddToBuffer(const MemPtr_t pContent, MemSize_t size, BufferMgmtPtr_t pBufMgr); --- 112,115 ---- Index: xltdecwbxml.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltdecwbxml.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** xltdecwbxml.h 2 May 2003 22:05:08 -0000 1.2 --- xltdecwbxml.h 24 May 2004 01:33:39 -0000 1.3 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: internal WBXML decoder header file */ ! /* file: XLTDecWbxml.h */ ! /* target system: - */ ! /* target OS: - */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * internal WBXML decoder header file ! * ! * @target_system - ! * @target_os - ! */ /* Index: xltencxml.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltencxml.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** xltencxml.h 14 Nov 2003 09:43:26 -0000 1.2 --- xltencxml.h 24 May 2004 01:33:39 -0000 1.3 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: The XML Encoder header file */ ! /* file: xltencxml.h */ ! /* target system: All */ ! /* target OS: All */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * The XML Encoder header file ! * ! * @target_system All ! * @target_os All ! */ /* *************** *** 53,72 **** #include "xltenccom.h" ! // byte for XML tag begin parentheses #define XML_BEGPAR '<' ! // byte for XML tag end parentheses #define XML_ENDPAR '>' ! // byte for XML tag del #define XML_TAGDEL '/' ! // XML version #define XML_VERSION "1.0" ! // XML encoding #define XML_ENCODING "UTF-8" ! // XML namespaceattribute #define XML_NSSTART " xmlns='" #define XML_NSEND "'" --- 54,73 ---- #include "xltenccom.h" ! /** byte for XML tag begin parentheses */ #define XML_BEGPAR '<' ! /** byte for XML tag end parentheses */ #define XML_ENDPAR '>' ! /** byte for XML tag del */ #define XML_TAGDEL '/' ! /** XML version */ #define XML_VERSION "1.0" ! /** XML encoding */ #define XML_ENCODING "UTF-8" ! /** XML namespaceattribute */ #define XML_NSSTART " xmlns='" #define XML_NSEND "'" *************** *** 76,96 **** #endif - /** - * FUNCTION: xmlGenerateTag - * - * Generates a XML tag - * - * PRE-Condition: valid parameters - * - * POST-Condition: the XML tag is written to the XML buffer - * - * IN: tagId, the ID for the tag to generate (TN_ADD, ...) - * tagType, the tag type (e.g. Begin Tag -> TT_BEG, ...) - * - * IN/OUT: pBufMgr, pointer to a structure containing buffer management elements - * - * RETURN: shows error codes of function, - * 0, if OK - */ Ret_t xmlGenerateTag(XltTagID_t tagId, XltTagType_t tagType, BufferMgmtPtr_t pBufMgr, SmlPcdataExtension_t attFlag); --- 77,80 ---- Index: xltutilstack.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltutilstack.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xltutilstack.h 6 Aug 2002 20:42:51 -0000 1.1 --- xltutilstack.h 24 May 2004 01:33:39 -0000 1.2 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: XLT Decoder Util */ ! /* file: XLTUtilStack.h */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ /* --- 1,11 ---- ! /** ! * @file ! * XLT Decoder Util ! * ! * @target_system all ! * @target_os all ! * @description Header file for a simple stack implementation used ! * by the WBXML scanner and the SyncML parser. ! */ /* *************** *** 42,50 **** */ - /** - * Header file for a simple stack implementation used by the WBXML scanner - * and the SyncML parser. - */ - /*************************************************************************/ /* Definitions */ --- 45,48 ---- *************** *** 56,62 **** #include <smldef.h> ! /* type for stack elements */ typedef XltTagID_t XltUtilStackItem_t; /** * XLTUtilStack interface --- 54,62 ---- #include <smldef.h> ! /** type for stack elements */ typedef XltTagID_t XltUtilStackItem_t; + /** @copydoc XltUtilStack_s */ + typedef struct XltUtilStack_s *XltUtilStackPtr_t, XltUtilStack_t; /** * XLTUtilStack interface *************** *** 67,155 **** * structure that is not visible to the users of the stack. A stack object * has the following public methods: ! * ! * FUNCTION: top ! * ! * Returns the top element of the stack. ! * ! * PRE-Condition: ! * the stack contains at least one element ! * ! * POST-Condition: ! * ! * IN: the stack ! * ! * OUT: the top element of the stack ! * ! * IN/OUT: ! * ! * RETURNS: SML_ERR_WRONG_USAGE, if the stack is empty ! * SML_ERR_OK, else ! * ! * FUNCTION: pop ! * ! * Returns the top element and takes it off the stack. ! * ! * PRE-Condition: ! * the stack contains at least one element ! * ! * POST-Condition: ! * the top element of the stack is removed ! * ! * IN: ! * ! * OUT: the top element of the stack ! * ! * IN/OUT: the stack ! * ! * RETURNS: SML_ERR_WRONG_USAGE, if the stack is empty ! * SML_ERR_NOT_ENOUGH_SPACE, if memory reallocation failed ! * SML_ERR_OK, else ! * ! * FUNCTION: push ! * ! * Put a new element on top of the stack. ! * ! * PRE-Condition: ! * ! * POST-Condition: ! * popping the stack yields the same stack as before ! * the push ! * ! * IN: the new stack element ! * ! * OUT: ! * ! * IN/OUT: the stack ! * ! * RETURNS: SML_ERR_NOT_ENOUGH_SPACE, if memory reallocation failed ! * SML_ERR_OK, else ! * ! * FUNCTION: destroy ! * ! * Free the memory used by the stack. ! * ! * PRE-Condition: ! * POST-Condition: ! * ! * IN: ! * ! * OUT: ! * ! * IN/OUT: the stack ! * ! * RETURNS: SML_ERR_OK ! */ ! typedef struct XltUtilStack_s *XltUtilStackPtr_t, XltUtilStack_t; struct XltUtilStack_s { ! Ret_t (*top)(const XltUtilStackPtr_t, XltUtilStackItem_t *); ! Ret_t (*pop)(XltUtilStackPtr_t, XltUtilStackItem_t *); ! Ret_t (*push)(XltUtilStackPtr_t, const XltUtilStackItem_t); ! Ret_t (*destroy)(XltUtilStackPtr_t); }; /** - * FUNCTION: xltUtilCreateStack - * * Creates a new stack. The size parameter indicates for how many elements * memory should be allocated initially. This does _not_ mean that you can --- 67,125 ---- * structure that is not visible to the users of the stack. A stack object * has the following public methods: ! */ struct XltUtilStack_s { ! /** ! * Returns the top element of the stack. ! * ! * @pre the stack contains at least one element ! * @param XltUtilStackPtr_t (IN) ! * the stack ! * @param XltUtilStackItem_t (OUT) ! * the top element of the stack ! * @return - SML_ERR_WRONG_USAGE, if the stack is empty ! * - SML_ERR_OK, else ! */ ! Ret_t (*top)(const XltUtilStackPtr_t, XltUtilStackItem_t *); ! ! /** ! * Returns the top element and takes it off the stack. ! * ! * @pre the stack contains at least one element ! * @post the top element of the stack is removed ! * @param XltUtilStackPtr_t (IN/OUT) ! * the stack ! * @param XltUtilStackItem_t (OUT) ! * the top element of the stack ! * @return - SML_ERR_WRONG_USAGE, if the stack is empty ! * - SML_ERR_NOT_ENOUGH_SPACE, if memory reallocation failed ! * - SML_ERR_OK, else ! */ ! Ret_t (*pop)(XltUtilStackPtr_t, XltUtilStackItem_t *); ! ! /** ! * Put a new element on top of the stack. ! * ! * @post popping the stack yields the same stack as before the push ! * @param XltUtilStackPtr_t (IN/OUT) ! * the stack ! * @param XltUtilStackItem_t (IN) ! * the new stack element ! * @return - SML_ERR_NOT_ENOUGH_SPACE, if memory reallocation failed ! * - SML_ERR_OK, else ! */ ! Ret_t (*push)(XltUtilStackPtr_t, const XltUtilStackItem_t); ! ! /** ! * Free the memory used by the stack. ! * ! * @param XltUtilStackPtr_t (IN/OUT) ! * the stack ! * @return - SML_ERR_OK ! */ ! Ret_t (*destroy)(XltUtilStackPtr_t); }; /** * Creates a new stack. The size parameter indicates for how many elements * memory should be allocated initially. This does _not_ mean that you can *************** *** 157,174 **** * memory for another size elements is allocated. * ! * PRE-Condition: ! * POST-Condition: ! * the stack pointer points to a new, empty stack ! * ! * IN: size, the initial size of the stack ! * ! * OUT: a new stack ! * ! * IN/OUT: ! * ! * RETURNS: SML_ERR_NOT_ENOUGH_SPACE, if memory allocation failed ! * SML_ERR_OK, else */ ! Ret_t xltUtilCreateStack(XltUtilStackPtr_t *, const Long_t size); #endif --- 127,139 ---- * memory for another size elements is allocated. * ! * @post the stack pointer points to a new, empty stack ! * @param ppStack (OUT) ! * a new stack ! * @param size (IN) ! * the initial size of the stack ! * @return - SML_ERR_NOT_ENOUGH_SPACE, if memory allocation failed ! * - SML_ERR_OK, else */ ! Ret_t xltUtilCreateStack(XltUtilStackPtr_t *ppStack, const Long_t size); #endif Index: xltmetinf.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltmetinf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xltmetinf.h 6 Aug 2002 20:42:51 -0000 1.1 --- xltmetinf.h 24 May 2004 01:33:39 -0000 1.2 *************** *** 1,9 **** ! /*************************************************************************/ ! /* module: Definition of MetaInf DTD prototypefunctions */ ! /* for the en-/decoder */ ! /* file: xltmetinf.h */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * Definition of MetaInf DTD prototypefunctions for the en-/decoder ! * ! * @target_system all ! * @target_os all ! */ /* Index: xlttagtbl.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xlttagtbl.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** xlttagtbl.h 2 May 2003 22:05:09 -0000 1.2 --- xlttagtbl.h 24 May 2004 01:33:39 -0000 1.3 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: Definition of en-/decoder tagtable data */ ! /* file: XLTTagtbl.h */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * Definition of en-/decoder tagtable data ! * ! * @target_system all ! * @target_os all ! */ /* *************** *** 62,66 **** /** ! * FUNCTION: buildXXX * * These functions each decode one single SyncML element starting at the --- 63,67 ---- /** ! * buildXXX * * These functions each decode one single SyncML element starting at the *************** *** 74,85 **** * are handled separately by the appendXXXList functions (see below). * ! * PRE-Condition: ! * ppElem is NULL ! * The scanner's current token is the start tag (may be ! * empty) of the SyncML element to be decoded. ! * ! * POST-Condition: ! * The scanner's current token is the end tag (or empty ! * start tag) of the SyncML element to be decoded. */ /* implemented in xltdec.c! */ --- 75,83 ---- * are handled separately by the appendXXXList functions (see below). * ! * @pre ppElem is NULL ! * The scanner's current token is the start tag (may be ! * empty) of the SyncML element to be decoded. ! * @post The scanner's current token is the end tag (or empty ! * start tag) of the SyncML element to be decoded. */ /* implemented in xltdec.c! */ Index: xltencxml.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xltencxml.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** xltencxml.c 14 Nov 2003 09:43:26 -0000 1.4 --- xltencxml.c 24 May 2004 01:33:39 -0000 1.5 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: The XML Encoder source file */ ! /* file: xltencxml.c */ ! /* target system: All */ ! /* target OS: All */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * The XML Encoder source file ! * ! * @target_system All ! * @target_os All ! */ /* *************** *** 56,75 **** /** - * FUNCTION: xmlGenerateTag - * * Generates a XML tag * ! * PRE-Condition: valid parameters ! * ! * POST-Condition: the XML tag is written to the XML buffer ! * ! * IN: tagId, the ID for the tag to generate (TN_ADD, ...) ! * tagType, the tag type (e.g. Begin Tag -> TT_BEG, ...) ! * attFlag, indicates if the encoded tag contain Attributes in namespace extensions ! * ! * IN/OUT: pBufMgr, pointer to a structure containing buffer management elements ! * ! * RETURN: shows error codes of function, ! * 0, if OK */ Ret_t xmlGenerateTag(XltTagID_t tagId, XltTagType_t tagType, BufferMgmtPtr_t pBufMgr, SmlPcdataExtension_t attFlag) --- 57,75 ---- /** * Generates a XML tag * ! * @pre valid parameters ! * @post the XML tag is written to the XML buffer ! * @param tagId (IN) ! * the ID for the tag to generate (TN_ADD, ...) ! * @param tagType (IN) ! * the tag type (e.g. Begin Tag -> TT_BEG, ...) ! * @param attFlag (IN) ! * indicates if the encoded tag contain Attributes in namespace ! * extensions ! * @param pBufMgr (IN/OUT) ! * pointer to a structure containing buffer management elements ! * @return shows error codes of function,\n ! * 0, if OK */ Ret_t xmlGenerateTag(XltTagID_t tagId, XltTagType_t tagType, BufferMgmtPtr_t pBufMgr, SmlPcdataExtension_t attFlag) Index: xlttags.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/all/xlttags.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xlttags.c 14 Aug 2003 12:48:42 -0000 1.3 --- xlttags.c 24 May 2004 01:33:39 -0000 1.4 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: Definition of WBXML/XML tags for the en-/decoder */ ! /* file: XLTTags.c */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * Definition of WBXML/XML tags for the en-/decoder ! * ! * @target_system all ! * @target_os all ! */ /* *************** *** 89,94 **** /** - * FUNCTION: getDtdTable - * * Returns a copy of the table containing all known (sub) dtd's * On error a NULL pointer is returned --- 90,93 ---- *************** *** 127,132 **** /** - * FUNCTION: getExtName - * * Returns the official name for a given extention/sub-DTD * and stored it in 'name'. If not found name isn't modified --- 126,129 ---- *************** *** 166,175 **** /** - * FUNCTION: getCpByName - * * Returns the codepage constant assoziated with the name stored in 'ns' * ! * RETURN: a SmlPcdataExtension_t representing the corresponding codepage id. ! * If no corresponding codepage is found -1 is returned. */ SmlPcdataExtension_t getExtByName(String_t ns) { --- 163,170 ---- /** * Returns the codepage constant assoziated with the name stored in 'ns' * ! * @return a SmlPcdataExtension_t representing the corresponding codepage id. ! * If no corresponding codepage is found -1 is returned. */ SmlPcdataExtension_t getExtByName(String_t ns) { *************** *** 220,230 **** /** - * FUNCTION: getTagTable - * * Returns the tag table - this function is used to avoid a global * tag table variable * ! * RETURN: a pointer to the tag table containing tag ids, ! * codepages, wbxml tags and xml tags */ /* T.K. initialized the structure via _TOKEN Macro, to take --- 215,223 ---- /** * Returns the tag table - this function is used to avoid a global * tag table variable * ! * @return a pointer to the tag table containing tag ids, ! * codepages, wbxml tags and xml tags */ /* T.K. initialized the structure via _TOKEN Macro, to take *************** *** 434,452 **** /** - * FUNCTION: getTagString - * * Returns a tag string which belongs to a tag ID. * This function is needed for the XML encoding * ! * PRE-Condition: valid tag ID, the tagSring has to be allocated ! * ! * POST-Condition: tag string is returned ! * ! * IN: tagId, the ID for the tag ! * ! * IN/OUT: tagString, allocated string into which the XML ! * tag string will be written ! * ! * RETURN: 0,if OK */ #ifdef __SML_XML__ --- 427,442 ---- /** * Returns a tag string which belongs to a tag ID. * This function is needed for the XML encoding * ! * @pre valid tag ID, the tagSring has to be allocated ! * @post tag string is returned ! * @param tagID (IN) ! * the ID for the tag ! * @param tagString (IN/OUT) ! * allocated string into which the XML... [truncated message content] |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:23
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/palm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/xpt/bindings/common/palm Modified Files: xptmutex.c Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: xptmutex.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/palm/xptmutex.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** xptmutex.c 2 May 2003 22:05:09 -0000 1.2 --- xptmutex.c 24 May 2004 01:33:40 -0000 1.3 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: SyncML HTTP protocol driver */ ! /* file: src/xpt/bindings/common/palm/xptihttp.h */ ! /* target system: Palm */ ! /* target OS: Palm */ ! /*************************************************************************/ --- 1,12 ---- ! /** ! * @file ! * SyncML HTTP protocol driver ! * ! * @target_system Palm ! * @target_os Palm ! * @description This module contains Palm specific definitions for the ! * HTTP protocol handler for SyncML ! * invokes the miscellaneous protocol drivers. ! */ *************** *** 44,54 **** - /** - * This module contains Palm specific definitions for the - * HTTP protocol handler for SyncML - * invokes the miscellaneous protocol drivers. - * - */ - #include "syncml_tk_prefix_file.h" // %%% luz: needed for precompiled headers in eVC++ --- 48,51 ---- |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:23
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/macosx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/xpt/bindings/common/macosx Modified Files: xptmutex.c Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: xptmutex.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/macosx/xptmutex.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xptmutex.c 15 Sep 2003 12:52:24 -0000 1.1 --- xptmutex.c 24 May 2004 01:33:40 -0000 1.2 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: SyncML HTTP protocol driver */ ! /* file: src/xpt/linux/xptihttp.h */ ! /* target system: Linux */ ! /* target OS: Linux */ ! /*************************************************************************/ --- 1,16 ---- ! /** ! * @file ! * SyncML HTTP protocol driver ! * ! * @target_system Linux ! * @target_os Linux ! * @description This module contains Linux specific definitions for the ! * HTTP protocol handler for SyncML. ! * ! * We could use pthread_mutex_lock(), etc., on Linux, but since the pthread ! * library on Linux is not universally installed, and since this code isn't ! * intended for multithreaded applications just yet, anyway, we use nothing ! * for now. This should be changed for proper multithreaded support on Linux. ! */ *************** *** 43,56 **** */ - /** - * This module contains Linux specific definitions for the - * HTTP protocol handler for SyncML. - * - * We could use pthread_mutex_lock(), etc., on Linux, but since the pthread - * library on Linux is not universally installed, and since this code isn't - * intended for multithreaded applications just yet, anyway, we use nothing - * for now. This should be changed for proper multithreaded support on Linux. - */ - #include <stddef.h> #include "xptmutex.h" --- 51,54 ---- |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:23
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/xpt/bindings/common/linux Modified Files: xptmutex.c Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: xptmutex.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/linux/xptmutex.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xptmutex.c 6 Aug 2002 21:03:21 -0000 1.1 --- xptmutex.c 24 May 2004 01:33:39 -0000 1.2 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: SyncML HTTP protocol driver */ ! /* file: src/xpt/linux/xptihttp.h */ ! /* target system: Linux */ ! /* target OS: Linux */ ! /*************************************************************************/ --- 1,16 ---- ! /** ! * @file ! * SyncML HTTP protocol driver ! * ! * @target_system Linux ! * @target_os Linux ! * @description This module contains Linux specific definitions for the ! * HTTP protocol handler for SyncML. ! * ! * We could use pthread_mutex_lock(), etc., on Linux, but since the pthread ! * library on Linux is not universally installed, and since this code isn't ! * intended for multithreaded applications just yet, anyway, we use nothing ! * for now. This should be changed for proper multithreaded support on Linux. ! */ *************** *** 43,56 **** */ - /** - * This module contains Linux specific definitions for the - * HTTP protocol handler for SyncML. - * - * We could use pthread_mutex_lock(), etc., on Linux, but since the pthread - * library on Linux is not universally installed, and since this code isn't - * intended for multithreaded applications just yet, anyway, we use nothing - * for now. This should be changed for proper multithreaded support on Linux. - */ - #include <stddef.h> #include "xptmutex.h" --- 51,54 ---- |
Update of /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/all In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/xpt/bindings/common/all Modified Files: digcalc.c digcalc.h global.h md5.h xpt-auth.c xpt-auth.h xpt-b64.c xpt-b64.h xptmutex.h Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: digcalc.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/all/digcalc.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** digcalc.h 6 Aug 2002 21:02:58 -0000 1.1 --- digcalc.h 24 May 2004 01:33:39 -0000 1.2 *************** *** 36,46 **** /* - The following code implements the calculations of H(A1), H(A2), request-digest and response-digest, and a test program which computes the values used in the example of section 3.5. It uses the MD5 implementation from RFC 1321. - - File "digcalc.h": */ --- 36,43 ---- Index: xptmutex.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/all/xptmutex.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xptmutex.h 6 Aug 2002 21:02:58 -0000 1.1 --- xptmutex.h 24 May 2004 01:33:39 -0000 1.2 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: SyncML HTTP protocol driver */ ! /* file: src/xpt/bindings/common/all/xptmutex.h */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * SyncML HTTP protocol driver ! * ! * @target_system all ! * @target_os all ! */ /* Index: xpt-auth.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/all/xpt-auth.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xpt-auth.h 6 Aug 2002 21:02:58 -0000 1.1 --- xpt-auth.h 24 May 2004 01:33:39 -0000 1.2 *************** *** 53,56 **** --- 53,57 ---- /* Authentication info, Basic and Digest authentication */ /********************************************************/ + /** required authentication */ typedef enum { *************** *** 58,63 **** AUTH_BASIC = 1, AUTH_DIGEST = 2 ! } HttpAuthenticationType_t; // required authentication ! typedef enum { --- 59,65 ---- AUTH_BASIC = 1, AUTH_DIGEST = 2 ! } HttpAuthenticationType_t; ! ! /** authentication destination */ typedef enum { *************** *** 65,69 **** DEST_SERVER = 1, DEST_PROXY = 2 ! } HttpAuthenticationDest_t; // authentication destination typedef struct --- 67,71 ---- DEST_SERVER = 1, DEST_PROXY = 2 ! } HttpAuthenticationDest_t; typedef struct Index: xpt-b64.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/all/xpt-b64.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xpt-b64.h 6 Aug 2002 21:02:58 -0000 1.1 --- xpt-b64.h 24 May 2004 01:33:39 -0000 1.2 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: Communication Services, base64 encoding/decoding fns.*/ ! /* file: /src/xpt/all/xpt-b64.h */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ --- 1,11 ---- ! /** ! * @file ! * Communication Services, base64 encoding/decoding fns. ! * ! * @target_system all ! * @target_os all ! * @description function prototypes and return codes ! * for base64 encoding/ decoding functions. ! */ *************** *** 43,52 **** */ - /** - * function prototypes and return codes - * for base64 encoding/ decoding functions. - * - */ - #ifndef XPT_B64_H #define XPT_B64_H --- 46,49 ---- *************** *** 55,122 **** /** ! * FUNCTION: base64GetSize ! * ! * Precalculates the size of an encoded document with the given size ! * ! * PRE-Condition: ! * The function is called to get the size of the document that ! * will be encoded with the base64Encode() service. ! * ! * POST-Condition: ! * ! * IN: cbRealDataSize, the size of the non-encoded document. ! * ! * RETURN: BufferSize_t, the size of the encoded document that will be ! * generated using the base64Encode() service. * */ - BufferSize_t base64GetSize (BufferSize_t cbRealDataSize); /** ! * FUNCTION: base64Encode ! * ! * Encodes a chunk of data according to the base64 encoding rules ! * ! * PRE-Condition: ! * A chunk of data os copied to the source data buffer pbData, and the ! * length of the data chunk is specified in *pcbDataLength; ! * ! * POST-Condition: ! * A block of encoded data is available in the specified target buffer. ! * The length of the encoded data is returned by the function. ! * ! * ! * IN: pbTarget, pointer to an allocated chunk of memory that receives the ! * encoded data block. ! * cbTargetSize, size of the data buffer above. ! * bLast, flag that indicates if the specified block is the last ! * part of the document. If the value is 0, the funciton expects ! * that other blocks will follow, a value of 1 indicates that ! * the data block that is presented in the input buffer is the ! * last data block to be encoded. ! * pbSaveBytes, pointer to a block of at least 3 Bytes. When this function ! * is invoked the first time, the first byte of this buffer MUST ! * be set to 0. ! * IN/OUT: ! * pbData, pointer to a data block that contains the clear data that ! * are to be encoded. On return, the remaining piece of the ! * input data block that could not be encoded is copied to ! * the memory that pbData points at. ! * pcbDataLength, pointer to a variable that denotes the length of ! * the data block that is to be encoded, The function updates ! * this value with the size of the data block that could not ! * be processed. If all data were able to be encoded, the ! * value will be 0. ! * pcbOffset, pointer to a variable that is internally used by the ! * function. before the first call of base64encode() for a ! * certain document is made, the variable that pcbOffset points ! * at must be set to 0. The variable will be updated by the ! * function, and should not be modified by the caller. ! * RETURN: BufferSize_t, the size of the data block that are available in ! * pbTarget. * */ - BufferSize_t base64Encode (DataBuffer_t pbTarget, BufferSize_t cbTargetSize, --- 52,103 ---- /** ! * Precalculates the size of an encoded document with the given size * + * @pre The function is called to get the size of the document that + * will be encoded with the base64Encode() service. + * @param cbRealDataSize (IN) + * the size of the non-encoded document. + * @return the size of the encoded document that will be generated + * using the base64Encode() service. */ BufferSize_t base64GetSize (BufferSize_t cbRealDataSize); /** ! * Encodes a chunk of data according to the base64 encoding rules * + * @pre A chunk of data os copied to the source data buffer pbData, and the + * length of the data chunk is specified in *pcbDataLength; + * @post A block of encoded data is available in the specified target buffer. + * The length of the encoded data is returned by the function. + * @param pbTarget (IN) + * pointer to an allocated chunk of memory that receives the + * encoded data block. + * @param cbTargetSize (IN) + * size of the data buffer above. + * @param bLast (IN) + * flag that indicates if the specified block is the last part of the + * document. If the value is 0, the funciton expects that other blocks + * will follow, a value of 1 indicates that the data block that is + * presented in the input buffer is the last data block to be encoded. + * @param pbSavebytes (IN) + * pointer to a block of at least 3 Bytes. When this function is invoked + * the first time, the first byte of this buffer MUST be set to 0. + * @param pbData (IN/OUT) + * pointer to a data block that contains the clear data that are to be + * encoded. On return, the remaining piece of the input data block that + * could not be encoded is copied to the memory that pbData points at. + * @param pcbDataLength (IN/OUT) + * pointer to a variable that denotes the length of the data block + * that is to be encoded, The function updates this value + * with the size of the data block that could not be processed. + * If all data were able to be encoded, the value will be 0. + * @param pcbOffset (IN/OUT) + * pointer to a variable that is internally used by the function. + * before the first call of base64encode() for a certain document is + * made, the variable that pcbOffset points at must be set to 0. + * The variable will be updated by the function, and should not be + * modified by the caller. + * @return the size of the data block that are available in pbTarget. */ BufferSize_t base64Encode (DataBuffer_t pbTarget, BufferSize_t cbTargetSize, *************** *** 127,164 **** unsigned char *pbSavebytes); /** ! * FUNCTION: base64Decode ! * ! * Decodes a chunk of data according to the base64 encoding rules ! * ! * PRE-Condition: ! * A chunk of data os copied to the source data buffer pbData, and the ! * length of the data chunk is specified in *pcbDataLength; ! * ! * POST-Condition: ! * A block of decoded data is available in the specified target buffer. ! * The length of the decoded data is returned by the function. ! * ! * ! * IN: pbTarget, pointer to an allocated chunk of memory that receives the ! * decoded data block. ! * cbTargetSize, size of the data buffer above. ! * IN/OUT: ! * pbData, pointer to a data block that contains the clear data that ! * are to be decoded. On return, the remaining piece of the ! * input data block that could not be decoded is copied to ! * the memory that pbData points at. ! * pcbDataLength, pointer to a variable that denotes the length of ! * the data block that is to be decoded, The function updates ! * this value with the size of the data block that could not ! * be processed. If all data were able to be decoded, the ! * value will be 0. ! * RETURN: BufferSize_t, the size of the data block that are available in ! * pbTarget. If some invalid data were detected in the input ! * data buffer, or if cbTargetSize is less than 3, ! * the function returns 0. The caller should treat this as an ! * error condition. * */ - BufferSize_t base64Decode (DataBuffer_t pbTarget, BufferSize_t cbTargetSize, --- 108,137 ---- unsigned char *pbSavebytes); /** ! * Decodes a chunk of data according to the base64 encoding rules * + * @pre A chunk of data os copied to the source data buffer pbData, and the + * length of the data chunk is specified in *pcbDataLength; + * @post A block of decoded data is available in the specified target buffer. + * The length of the decoded data is returned by the function. + * @param pbTarget (IN) + * pointer to an allocated chunk of memory + * that receives the decoded data block. + * @param cbTargetSize (IN) + * size of the data buffer above. + * @param pbData (IN/OUT) + * pointer to a data block that contains the clear data that are to be + * decoded. On return, the remaining piece of the input data block + * that could not be decoded is copied to the memory + * that pbData points at. + * @param pcbDataLength (IN/OUT) + * pointer to a variable that denotes the length of the data block + * that is to be decoded, The function updates this value with + * the size of the data block that could not be processed. + * If all data were able to be decoded, the value will be 0. + * @return the size of the data block that are available in pbTarget. + * If some invalid data were detected in the input data buffer, + * or if cbTargetSize is less than 3, the function returns 0. + * The caller should treat this as an error condition. */ BufferSize_t base64Decode (DataBuffer_t pbTarget, BufferSize_t cbTargetSize, *************** *** 168,169 **** --- 141,143 ---- #endif + Index: xpt-auth.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/all/xpt-auth.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xpt-auth.c 7 Apr 2004 06:51:06 -0000 1.3 --- xpt-auth.c 24 May 2004 01:33:39 -0000 1.4 *************** *** 46,75 **** typedef struct _HttpDigest { ! int cbSize; // size of this structure ! HttpAuthenticationType_t fType; // type of authorization, set by server ! HttpAuthenticationDest_t fDest; // destination: server or proxy? ! char achUser [MAX_USER_SIZE]; // user name ! char achPassword [MAX_PWD_SIZE]; // Password ! char achDigest [MAX_DIGEST_SIZE];// digest value ! char achRealm [MAX_REALM_SIZE]; // server realm value, set by server ! Bool_t bStale; // stale flag ! char achCNonce [MAX_CNONCE_SIZE];// Client Nonce. ! char achNonce [MAX_NONCE_SIZE]; // nonce value, ! char achQOp [MAX_QOP_SIZE]; // selected algorithm ! char achNC [MAX_NC_SIZE]; // incremented after each HTTP message. ! char achOpaque [MAX_OPAQUE_SIZE];// opaque value, set by server ! char achDomain [MAX_DOMAIN_SIZE];// domain Info } HttpDigest_t, *HttpDigestPtr_t; ! /***********************/ ! /* Authentication Info */ ! /***********************/ typedef struct { ! int rfu; // not used. ! int cbCount; // # of authentication structures ! HttpDigestPtr_t digest [1]; // array of digest structures } HttpAuthentication_t; --- 46,75 ---- typedef struct _HttpDigest { ! int cbSize; /**< size of this structure */ ! HttpAuthenticationType_t fType; /**< type of authorization, set by server */ ! HttpAuthenticationDest_t fDest; /**< destination: server or proxy? */ ! char achUser [MAX_USER_SIZE]; /**< user name */ ! char achPassword [MAX_PWD_SIZE]; /**< Password */ ! char achDigest [MAX_DIGEST_SIZE];/**< digest value */ ! char achRealm [MAX_REALM_SIZE]; /**< server realm value, set by server */ ! Bool_t bStale; /**< stale flag */ ! char achCNonce [MAX_CNONCE_SIZE];/**< Client Nonce. */ ! char achNonce [MAX_NONCE_SIZE]; /**< nonce value, */ ! char achQOp [MAX_QOP_SIZE]; /**< selected algorithm */ ! char achNC [MAX_NC_SIZE]; /**< incremented after each HTTP message. */ ! char achOpaque [MAX_OPAQUE_SIZE];/**< opaque value, set by server */ ! char achDomain [MAX_DOMAIN_SIZE];/**< domain Info */ } HttpDigest_t, *HttpDigestPtr_t; ! /** ! * Authentication Info ! */ typedef struct { ! int rfu; /**< not used. */ ! int cbCount; /**< # of authentication structures */ ! HttpDigestPtr_t digest [1]; /**< array of digest structures */ } HttpAuthentication_t; Index: digcalc.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/all/digcalc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** digcalc.c 2 May 2003 22:05:09 -0000 1.2 --- digcalc.c 24 May 2004 01:33:39 -0000 1.3 *************** *** 36,47 **** /* - The following code implements the calculations of H(A1), H(A2), request-digest and response-digest, and a test program which computes the values used in the example of section 3.5. It uses the MD5 implementation from RFC 1321. - - - File "digcalc.c": */ --- 36,43 ---- Index: global.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/all/global.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** global.h 6 Aug 2002 21:02:58 -0000 1.1 --- global.h 24 May 2004 01:33:39 -0000 1.2 *************** *** 1,2 **** --- 1,10 ---- + /** + * @file + * RSAREF Types and Constants Definition + * + * @target_system all + * @target_os all + */ + /* * Copyright Notice *************** *** 36,42 **** - /* GLOBAL.H - RSAREF types and constants - */ - /* PROTOTYPES should be set to one if and only if the compiler supports function argument prototyping. --- 44,47 ---- Index: md5.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/all/md5.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** md5.h 6 Aug 2002 21:02:58 -0000 1.1 --- md5.h 24 May 2004 01:33:39 -0000 1.2 *************** *** 60,68 **** */ ! /* MD5 context. */ typedef struct { ! UINT4 state[4]; /* state (ABCD) */ ! UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */ ! unsigned char buffer[64]; /* input buffer */ } MD5_CTX; --- 60,68 ---- */ ! /** MD5 context. */ typedef struct { ! UINT4 state[4]; /**< state (ABCD) */ ! UINT4 count[2]; /**< number of bits, modulo 2^64 (lsb first) */ ! unsigned char buffer[64]; /**< input buffer */ } MD5_CTX; Index: xpt-b64.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/xpt/bindings/common/all/xpt-b64.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** xpt-b64.c 2 May 2003 22:05:09 -0000 1.2 --- xpt-b64.c 24 May 2004 01:33:39 -0000 1.3 *************** *** 1,9 **** ! ! /*************************************************************************/ ! /* module: Communication Services, base64 encoding/decoding fns.*/ ! /* file: src/xpt/all/xpt-b64.c */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ --- 1,9 ---- ! /** ! * @file ! * Communication Services, base64 encoding/decoding fns. ! * ! * @target_system all ! * @target_os all ! */ |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:19
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/sml/xlt/inc Modified Files: xltdec.h xltenc.h Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: xltenc.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/inc/xltenc.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** xltenc.h 14 Aug 2003 12:49:35 -0000 1.2 --- xltenc.h 24 May 2004 01:33:39 -0000 1.3 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: Encoder header file */ ! /* file: xltenc.h */ ! /* target system: All */ ! /* target OS: All */ ! /*************************************************************************/ /* --- 1,9 ---- ! /** ! * @file ! * Encoder header file ! * ! * @target_system All ! * @target_os All ! */ /* *************** *** 60,64 **** #endif ! //Type for storing encoder information typedef struct XltEncoder_s { --- 61,65 ---- #endif ! /** Type for storing encoder information */ typedef struct XltEncoder_s { *************** *** 73,188 **** - /** - * FUNCTION: smlXltEncInit - * - * Initializes an XML buffer; Creates XML code for the SyncHdr - * and appends it to the buffer. - * Returns 0 if operation was successful. - * - * PRE-Condition: no memory should be allocated for ppEncoder (should be NULL) - * pHeader has to contain a valid SyncHdr structure - * pBufEnd must point to the end of the (WB)XML buffer - * ppBufPos has to be initialized to the start point of the - * (WB)XML buffer. - * - * - * POST-Condition: After the function call ppBufPos points to the - * first free byte in the buffer behind the (WB)XML document - * - * IN: enc, the encoding constant (SML_WBXML or SML_XML) - * pHeader, the SyncML header structure - * pBufEnd, pointer to the end of the buffer to write on - * %%% luz:2003-07-31: vers must be the SyncML version (for namespaces and FPI's) - * - * IN/OUT: ppBufPos, current position of the bufferpointer - * ppEncoder, the encoder object - * - * RETURN: shows error codes of function, - * 0, if OK - * Possible Error Codes: - * SML_ERR_XLT_MISSING_CONT - * SML_ERR_XLT_BUF_ERR - * SML_ERR_XLT_INVAL_ELEM_TYPE - * SML_ERR_XLT_INVAL_LIST_TYPE - * SML_ERR_XLT_INVAL_TAG_TYPE - * SML_ERR_XLT_CONTENT_SIZE_LENGTH - * SML_ERR_XLT_ENC_UNK - * SML_ERR_XLT_INVAL_PROTO_ELEM - */ Ret_t xltEncInit(SmlEncoding_t enc, const SmlSyncHdrPtr_t pHeader, const MemPtr_t pBufEnd, MemPtr_t *ppBufPos, XltEncoderPtr_t *ppEncoder, SmlVersion_t vers); ! ! /** ! * FUNCTION: smlXltEncAppend ! * ! * Generates XML code and appends it to the XML buffer. ! * ! * PRE-Condition: pEncoder holds the initialized encoder structure. ! * the initialization takes place in the xltEncAppend function ! * pContent has to contain a valid content structure structure ! * pBufEnd must point to the end of the (WB)XML buffer ! * ppBufPos has to be initialized to the start point of the ! * (WB)XML buffer. ! * ! * ! * POST-Condition: After the function call ppBufPos points to the ! * first free byte in the buffer behind the (WB)XML document ! * ! * IN: pEncoder, the encoder object ! * pe, the protocol element (PE_ADD, ...) ! * pBufEnd, pointer to the end of the buffer to write on ! * pContent, the content to append to the SyncML document ! * ! * IN/OUT: ppBufPos, current position of the bufferpointer ! * ! * RETURN: shows error codes of function, ! * 0, if OK ! * Possible Error Codes: ! * SML_ERR_XLT_MISSING_CONT ! * SML_ERR_XLT_BUF_ERR ! * SML_ERR_XLT_INVAL_ELEM_TYPE ! * SML_ERR_XLT_INVAL_LIST_TYPE ! * SML_ERR_XLT_INVAL_TAG_TYPE ! * SML_ERR_XLT_CONTENT_SIZE_LENGTH ! * SML_ERR_XLT_ENC_UNK ! * SML_ERR_XLT_INVAL_PROTO_ELEM ! */ ! ! Ret_t xltEncAppend(const XltEncoderPtr_t pEncoder, ! SmlProtoElement_t pe, ! const MemPtr_t pBufEnd, ! const VoidPtr_t pContent, ! MemPtr_t *ppBufPos); ! /** ! * FUNCTION: smlXltEncTerminate_t pBufEnd, const VoidPtr_t pContent, MemPtr_t *ppBufPos, ! * ! * Finalizes the (WB)XML document and returns the size of written bytes to ! * the workspace module ! * ! * PRE-Condition: pEncoder holds the initialized encoder structure. ! * the initialization takes place in the xltEncAppend function ! * pBufEnd must point to the end of the (WB)XML buffer ! * ppBufPos has to be initialized to the start point of the ! * (WB)XML buffer. ! * ! * POST-Condition: After the function call ppBufPos points to the ! * first free byte in the buffer behind the (WB)XML document ! * ! * IN: pEncoder, the encoder object ! * pBufEnd, pointer to the end of the buffer to write on ! * ! * IN/OUT: ppBufPos, current position of the bufferpointer ! * ! * RETURN: shows error codes of function, ! * 0, if OK ! * Possible Error Codes: ! * SML_ERR_XLT_MISSING_CONT ! * SML_ERR_XLT_BUF_ERR ! * SML_ERR_XLT_INVAL_ELEM_TYPE ! * SML_ERR_XLT_INVAL_LIST_TYPE ! * SML_ERR_XLT_INVAL_TAG_TYPE ! * SML_ERR_XLT_CONTENT_SIZE_LENGTH ! * SML_ERR_XLT_ENC_UNK ! * SML_ERR_XLT_INVAL_PROTO_ELEM ! */ Ret_t xltEncTerminate(const XltEncoderPtr_t pEncoder, const MemPtr_t pBufEnd, MemPtr_t *ppBufPos); Ret_t xltEncReset(XltEncoderPtr_t pEncoder); --- 74,79 ---- Ret_t xltEncInit(SmlEncoding_t enc, const SmlSyncHdrPtr_t pHeader, const MemPtr_t pBufEnd, MemPtr_t *ppBufPos, XltEncoderPtr_t *ppEncoder, SmlVersion_t vers); ! Ret_t xltEncAppend(const XltEncoderPtr_t pEncoder, SmlProtoElement_t pe, const MemPtr_t pBufEnd, const VoidPtr_t pContent, MemPtr_t *ppBufPos); Ret_t xltEncTerminate(const XltEncoderPtr_t pEncoder, const MemPtr_t pBufEnd, MemPtr_t *ppBufPos); Ret_t xltEncReset(XltEncoderPtr_t pEncoder); Index: xltdec.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/xlt/inc/xltdec.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xltdec.h 6 Aug 2002 20:42:51 -0000 1.1 --- xltdec.h 24 May 2004 01:33:39 -0000 1.2 *************** *** 1,8 **** ! /*************************************************************************/ ! /* module: Interface for the XLT Decoder component. */ ! /* file: XLTDec.h */ ! /* target system: all */ ! /* target OS: all */ ! /*************************************************************************/ /* --- 1,11 ---- ! /** ! * @file ! * Interface for the XLT Decoder component. ! * ! * @target_system all ! * @target_os all ! * @description Interface for the WBXML and XML decoder component. ! */ ! /* *************** *** 42,49 **** */ - /** - * Interface for the WBXML and XML decoder component. - */ - /*************************************************************************/ /* Definitions */ --- 45,48 ---- *************** *** 69,109 **** * parameter for any public method is the object of which the method is * called. - * - * The decoder's public methods/attributes are: - * - * ATTRIBUTE: charset - * - * Character set used in the document - this is the MIBEnum value assigned - * by the IANA for the character encoding, e.g. "3" for US-ASCII. - * - * ATTRIBUTE: charsetStr - * - * Name of the character set, e.g. "US-ASCII" - valid only when charset == 0. - * - * ATTRIBUTE: finished - * - * Indicates whether the decoder has reached the end of the buffer during - * the last call to xltDecNext. - * - * ATTRIBUTE: scanner - * - * Pointer to the scanner status object used by this decoder. The scanner - * will be created during the initialization of the decoder as either a XML - * or WBXML scanner. - * - * - * ATTRIBUTE: tagstack - * - * The decoder uses an internal stack to check that for every start tag - * there is a corresponding end tag. - */ typedef struct XltDecoder_s { Long_t charset; String_t charsetStr; Flag_t finished; Boolean_t final; XltDecScannerPtr_t scanner; XltUtilStackPtr_t tagstack; --- 68,105 ---- * parameter for any public method is the object of which the method is * called. */ typedef struct XltDecoder_s { + /** + * Character set used in the document - this is the MIBEnum value assigned + * by the IANA for the character encoding, e.g. "3" for US-ASCII. + */ Long_t charset; + + /** + * Name of the character set, e.g. "US-ASCII" - valid + * only when charset == 0. + */ String_t charsetStr; + + /** + * Indicates whether the decoder has reached the end of the buffer during + * the last call to xltDecNext. + */ Flag_t finished; + Boolean_t final; + + /** + * Pointer to the scanner status object used by this decoder. The scanner + * will be created during the initialization of the decoder as either a XML + * or WBXML scanner. + */ XltDecScannerPtr_t scanner; + + /** + * The decoder uses an internal stack to check that for every start tag + * there is a corresponding end tag. + */ XltUtilStackPtr_t tagstack; *************** *** 111,142 **** /** - * FUNCTION: xltDecInit - * * Initializes a new decoder object. This function allocates memory for the * decoder structure which has to be freed by a call to the decoder's ! * terminate method when the decoder is not needed anymore. As part of the * initialization the decoder begins decoding the SyncML document to find * the SyncHdr element. * ! * PRE-Condition: ! * ppDecoder is NULL ! * ppBufPos ! * ! * POST-Condition: ! * ppDecoder points to an initialized decoder status object ! * ! * IN: enc, the document encoding (WBXML or XML) ! * pBufEnd, pointer to the end of the buffer which contains ! * the document ! * ! * IN/OUT: ppBufPos, pointer to the current position within the ! * buffer ! * ! * OUT: ppDecoder, the decoder status object ! * ppSyncHdr, the SyncHdr element ! * ! * RETURNS: SML_ERR_OK, if the decoder could be created and the ! * SmlSyncHdr was found ! * else error code */ Ret_t xltDecInit(const SmlEncoding_t enc, --- 107,133 ---- /** * Initializes a new decoder object. This function allocates memory for the * decoder structure which has to be freed by a call to the decoder's ! * terminate method when the decoder is not needed anymore. As part of the * initialization the decoder begins decoding the SyncML document to find * the SyncHdr element. * ! * @pre ppDecoder is NULL ! * ppBufPos ! * @post ppDecoder points to an initialized decoder status object ! * @param enc (IN) ! * the document encoding (WBXML or XML) ! * @param pBufEnd (IN) ! * pointer to the end of the buffer which contains the document ! * @param ppBufPos (IN/OUT) ! * pointer to the current position within the buffer ! * @param ppDecoder (OUT) ! * the decoder status object ! * @param ppSyncHdr (OUT) ! * the SyncHdr element ! * @return ! * - SML_ERR_OK, if the decoder could be created and the ! * SmlSyncHdr was found ! * - else error code */ Ret_t xltDecInit(const SmlEncoding_t enc, *************** *** 147,152 **** /** - * FUNCTION: xltDecNext - * * Decodes the next protocol element of the given SyncML document. This * function creates the data structures detailed in the SMLDtd header file. --- 138,141 ---- *************** *** 156,181 **** * found. In that case pPE is set to SML_PE_UNDEF and pContent is NULL. * ! * PRE-Condition: ! * pDecoder points to a decoder status object initialized ! * by xltDecInit ! * ! * POST-Condition: ! * pPE and pContent describe the next valid protocol ! * element within the SyncML document OR ! * the finished flag of the decoder status object is set ! * ! * IN: pBufEnd, pointer to the end of the buffer ! * ! * IN/OUT: pDecoder, the decoder status object ! * ppBufPos, pointer to the current position within the ! * buffer before and after the call to xltDecNext ! * ! * OUT: pPE, the type of the protocol element (e.g. SML_PE_ADD) ! * pContent, the data structure for the p.e. cast ! * (e.g. AddPtr_t) to a void pointer ! * ! * RETURN: SML_ERR_OK, if a valid protocol element was found or if ! * decoder reached the end of the buffer ! * else error code showing where the parsing failed */ Ret_t xltDecNext(XltDecoderPtr_t pDecoder, --- 145,168 ---- * found. In that case pPE is set to SML_PE_UNDEF and pContent is NULL. * ! * @pre pDecoder points to a decoder status object initialized by xltDecInit ! * @post pPE and pContent describe the next valid protocol ! * element within the SyncML document OR ! * the finished flag of the decoder status object is set ! * @param pBufEnd (IN) ! * pointer to the end of the buffer ! * @param pDecoder (IN/OUT) ! * the decoder status object ! * @param ppBufPos (IN/OUT) ! * pointer to the current position within the ! * buffer before and after the call to xltDecNext ! * @param pPE (OUT) ! * the type of the protocol element (e.g. SML_PE_ADD) ! * @param pContent (OUT) ! * the data structure for the p.e. cast ! * (e.g. AddPtr_t) to a void pointer ! * @return ! * - SML_ERR_OK, if a valid protocol element was found ! * or if decoder reached the end of the buffer ! * - else error code showing where the parsing failed */ Ret_t xltDecNext(XltDecoderPtr_t pDecoder, *************** *** 186,205 **** /** - * FUNCTION: xltDecTerminate - * * Frees the memory allocated by the decoder. * ! * PRE-Condition: ! * pDecoder points to a decoder status object initialized ! * by xltDecInit ! * ! * POST-Condition: ! * all memory allocated by the decoder status object is ! * freed ! * ! * IN: pDecoder, the decoder ! * ! * RETURN: SML_ERR_OK, if the memory could be freed ! * else error code */ Ret_t xltDecTerminate(XltDecoderPtr_t pDecoder); --- 173,185 ---- /** * Frees the memory allocated by the decoder. * ! * @pre pDecoder points to a decoder status object initialized by xltDecInit ! * @post all memory allocated by the decoder status object is freed ! * @param pDecoder (IN) ! * the decoder ! * @return ! * - SML_ERR_OK, if the memory could be freed ! * - else error code */ Ret_t xltDecTerminate(XltDecoderPtr_t pDecoder); *************** *** 216,223 **** #define IS_CONTENT(tok) ((tok)->type == TOK_CONT) /** ! * nextToken and discardToken are just wrappers around the scanner's ! * nextTok and pushTok methods that do some error checking. */ Ret_t nextToken(XltDecoderPtr_t pDecoder); Ret_t discardToken(XltDecoderPtr_t pDecoder); /* eof xltdec.c stuff */ --- 196,207 ---- #define IS_CONTENT(tok) ((tok)->type == TOK_CONT) /** ! * just wrapper around the scanner's ! * nextTok methods that do some error checking. */ Ret_t nextToken(XltDecoderPtr_t pDecoder); + /** + * just wrapper around the scanner's + * pushTok methods that do some error checking. + */ Ret_t discardToken(XltDecoderPtr_t pDecoder); /* eof xltdec.c stuff */ |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:18
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/sml/mgr/all Modified Files: mgr.c mgrcmdbuilder.c mgrcmddispatcher.c mgrinstancelist.c mgrinstancemgr.c mgrutil.c Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: mgrutil.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrutil.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mgrutil.c 14 Aug 2003 12:48:42 -0000 1.3 --- mgrutil.c 24 May 2004 01:33:36 -0000 1.4 *************** *** 1,11 **** ! /*************************************************************************/ ! /* module: some helper functions */ ! /* */ ! /* file: mgrutil.c */ ! /* target system: all */ ! /* target OS: all */ ! /* */ ! /* Description: */ ! /*************************************************************************/ /* --- 1,10 ---- ! /** ! * @file ! * some helper functions ! * ! * @target_system all ! * @target_os all ! * @description ! */ /* *************** *** 70,82 **** /** ! * FUNCTION: smlFreeProtoElement ! * ! * frees all allocated memory of a smlProtoElement ! * ! * IN: VoidPtr_t ! * Element to free * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlFreeProtoElement(VoidPtr_t pProtoElement) --- 69,77 ---- /** ! * Frees all allocated memory of a smlProtoElement * ! * @param pProtoElement (IN) ! * Element to free ! * @return Return Code */ SML_API Ret_t smlFreeProtoElement(VoidPtr_t pProtoElement) *************** *** 151,163 **** /** ! * FUNCTION: smlFreePcdata ! * ! * frees the Memory of an allocated Pcdata memory object ! * ! * IN: SmlPcdataPtr_t ! * A Pointer to a PcData structure, which should be freed ! * ! * RETURN: --- * */ SML_API void smlFreePcdata(SmlPcdataPtr_t pPcdata) --- 146,153 ---- /** ! * Frees the Memory of an allocated Pcdata memory object * + * @param pPcdata (IN) + * A Pointer to a PcData structure, which should be freed */ SML_API void smlFreePcdata(SmlPcdataPtr_t pPcdata) *************** *** 200,204 **** #ifdef __USE_METINF__ ! /** Subfunctions to smlFreePcdata, to freeup MetaInf DTD structures **/ SML_API void smlFreeMetinfMetinf(SmlMetInfMetInfPtr_t data) { if (!data) return; --- 190,194 ---- #ifdef __USE_METINF__ ! /** Subfunctions to smlFreePcdata, to freeup MetaInf DTD structures */ SML_API void smlFreeMetinfMetinf(SmlMetInfMetInfPtr_t data) { if (!data) return; *************** *** 236,240 **** #ifdef __USE_DEVINF__ ! /** Subfunctions to smlFreePcdata, to freeup DevInf DTD structures **/ SML_API void smlFreeDevInfDevInf(SmlDevInfDevInfPtr_t data) { if (!data) return; --- 226,230 ---- #ifdef __USE_DEVINF__ ! /** Subfunctions to smlFreePcdata, to freeup DevInf DTD structures */ SML_API void smlFreeDevInfDevInf(SmlDevInfDevInfPtr_t data) { if (!data) return; *************** *** 364,374 **** /** - * FUNCTION: smlGetFreeBuffer - * * Return amount of unused Workspace memory * ! * RETURN: MemSize_t ! * Amount of unused Workspace memory ! * */ SML_API MemSize_t smlGetFreeBuffer(InstanceID_t id) --- 354,361 ---- /** * Return amount of unused Workspace memory * ! * @param id instance ID ! * @return Amount of unused Workspace memory */ SML_API MemSize_t smlGetFreeBuffer(InstanceID_t id) *************** *** 395,408 **** /** ! * FUNCTION: smlString2Pcdata ! * ! * copy a string into a Pcdata structure ! * ! * IN: String_t ! * Input String ! * ! * RETURN: SmlPcdataPtr_t ! * A Pointer to a PcData structure * */ SML_API SmlPcdataPtr_t smlString2Pcdata(String_t str) --- 382,390 ---- /** ! * Copy a string into a Pcdata structure * + * @param str (IN) + * Input String + * @return A Pointer to a PcData structure */ SML_API SmlPcdataPtr_t smlString2Pcdata(String_t str) *************** *** 431,443 **** /** ! * FUNCTION: smlPcdata2String ! * ! * copy a Pcdata structure into a string ! * ! * IN: SmlPcdataPtr_t ! * A Pointer to a PcData structure ! * RETURN: String_t ! * Input String * */ SML_API String_t smlPcdata2String(SmlPcdataPtr_t pcdata) --- 413,421 ---- /** ! * Copy a Pcdata structure into a string * + * @param pcdata (IN) + * A Pointer to a PcData structure + * @return Input String */ SML_API String_t smlPcdata2String(SmlPcdataPtr_t pcdata) *************** *** 464,477 **** /** - * FUNCTION: smlPcdataDup - * * Duplicates a Pcdata memory object * ! * IN: SmlPcdataPtr_t ! * A Pointer to the original PcData structure ! * ! * RETURN: SmlPcdataPtr_t ! * A Pointer to the copy of the PcData structure ! * */ SML_API SmlPcdataPtr_t smlPcdataDup(SmlPcdataPtr_t pcdata) --- 442,450 ---- /** * Duplicates a Pcdata memory object * ! * @param pcdata (IN) ! * A Pointer to the original PcData structure ! * @return A Pointer to the copy of the PcData structure */ SML_API SmlPcdataPtr_t smlPcdataDup(SmlPcdataPtr_t pcdata) Index: mgrcmdbuilder.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrcmdbuilder.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mgrcmdbuilder.c 14 Nov 2003 09:43:26 -0000 1.5 --- mgrcmdbuilder.c 24 May 2004 01:33:36 -0000 1.6 *************** *** 1,12 **** ! /*************************************************************************/ ! /* module: SyncML Command Builder */ ! /* */ ! /* file: mgrcmdbuilder.c */ ! /* target system: all */ ! /* target OS: all */ ! /* */ ! /* Description: */ ! /* Core Module for assembling SyncML compliant documents */ ! /*************************************************************************/ --- 1,10 ---- ! /** ! * @file ! * SyncML Command Builder ! * ! * @target_system all ! * @target_os all ! * @description Core Module for assembling SyncML compliant documents ! */ *************** *** 127,146 **** /** - * FUNCTION: smlStartMessage - * * Start a SyncML Message * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: SmlSyncHdrPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code ! * ! * NOTE: (%%% luz 2003-08-06) this entry point is for compatibilty reasons only ! * and works for SyncML 1.0 only ! * please use smlStartMessageExt() instead in new projects. */ SML_API Ret_t smlStartMessage(InstanceID_t id, SmlSyncHdrPtr_t pContent) --- 125,138 ---- /** * Start a SyncML Message * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code ! * @note (%%% luz 2003-08-06) this entry point is for compatibilty ! * reasons only and works for SyncML 1.0 only\n ! * please use smlStartMessageExt() instead in new projects. */ SML_API Ret_t smlStartMessage(InstanceID_t id, SmlSyncHdrPtr_t pContent) *************** *** 152,170 **** /** - * FUNCTION: smlStartMessageExt - * (%%% added by luz 2003-08-06 to support SyncML versions other than - * 1.0 with new vers parameter) - * * Start a SyncML Message * ! * IN: InstanceID_t ! * ID of the used instance ! * SyncML version ! * ! * IN: SmlSyncHdrPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlStartMessageExt(InstanceID_t id, SmlSyncHdrPtr_t pContent, SmlVersion_t vers) --- 144,158 ---- /** * Start a SyncML Message * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @param vers (IN) ! * SyncML version ! * @return Return Code ! * @note (%%% added by luz 2003-08-06 to support SyncML versions other than ! * 1.0 with new vers parameter) */ SML_API Ret_t smlStartMessageExt(InstanceID_t id, SmlSyncHdrPtr_t pContent, SmlVersion_t vers) *************** *** 234,249 **** /** - * FUNCTION: smlEndMessage - * * End a SyncML Message * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: Boolean_t ! * Final Flag indicates last message within a package ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlEndMessage(InstanceID_t id, Boolean_t final) --- 222,232 ---- /** * End a SyncML Message * ! * @param id (IN) ! * ID of the used instance ! * @param final (IN) ! * Final Flag indicates last message within a package ! * @return Return Code */ SML_API Ret_t smlEndMessage(InstanceID_t id, Boolean_t final) *************** *** 318,333 **** /** - * FUNCTION: smlStartSync - * * Start synchronizing * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: SyncPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlStartSync(InstanceID_t id, SmlSyncPtr_t pContent) --- 301,310 ---- /** * Start synchronizing * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlStartSync(InstanceID_t id, SmlSyncPtr_t pContent) *************** *** 339,350 **** /** - * FUNCTION: smlEndSync - * * End synchronizing * ! * IN: InstanceID_t ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlEndSync(InstanceID_t id) --- 316,324 ---- /** * End synchronizing * ! * @param id (IN) ! * ID of the used instance ! * @return Return Code */ SML_API Ret_t smlEndSync(InstanceID_t id) *************** *** 357,372 **** /** - * FUNCTION: smlStartAtomic - * * Start an atomic sequence * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: SmlAtomicPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlStartAtomic(InstanceID_t id, SmlAtomicPtr_t pContent) --- 331,341 ---- /** * Start an atomic sequence * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlStartAtomic(InstanceID_t id, SmlAtomicPtr_t pContent) *************** *** 377,389 **** /** - * FUNCTION: smlEndAtomic - * * End an atomic sequence * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlEndAtomic(InstanceID_t id) --- 346,354 ---- /** * End an atomic sequence * ! * @param id (IN) ! * ID of the used instance ! * @return Return Code */ SML_API Ret_t smlEndAtomic(InstanceID_t id) *************** *** 397,412 **** /** - * FUNCTION: smlStartSequence - * * Start a sequence * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: SequencePtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlStartSequence(InstanceID_t id, SmlSequencePtr_t pContent) --- 362,372 ---- /** * Start a sequence * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlStartSequence(InstanceID_t id, SmlSequencePtr_t pContent) *************** *** 418,430 **** /** - * FUNCTION: smlEndSequence - * * End a sequence * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlEndSequence(InstanceID_t id) --- 378,386 ---- /** * End a sequence * ! * @param id (IN) ! * ID of the used instance ! * @return Return Code */ SML_API Ret_t smlEndSequence(InstanceID_t id) *************** *** 438,453 **** #ifdef ADD_SEND /** - * FUNCTION: smlAddCmd - * * Create a Add Command ! * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: SmlAddPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlAddCmd(InstanceID_t id, SmlAddPtr_t pContent) --- 394,404 ---- #ifdef ADD_SEND /** * Create a Add Command ! * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlAddCmd(InstanceID_t id, SmlAddPtr_t pContent) *************** *** 459,474 **** /** - * FUNCTION: smlAlertCmd - * * Create a Alert Command * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: SmlAlertPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlAlertCmd(InstanceID_t id, SmlAlertPtr_t pContent) --- 410,420 ---- /** * Create a Alert Command * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlAlertCmd(InstanceID_t id, SmlAlertPtr_t pContent) *************** *** 481,496 **** /** - * FUNCTION: smlDeleteCmd - * * Create a Start Message Command * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: DeletePtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlDeleteCmd(InstanceID_t id, SmlDeletePtr_t pContent) --- 427,437 ---- /** * Create a Start Message Command * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlDeleteCmd(InstanceID_t id, SmlDeletePtr_t pContent) *************** *** 505,520 **** /** - * FUNCTION: smlGetCmd - * * Create a Get Command * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: GetPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlGetCmd(InstanceID_t id, SmlGetPtr_t pContent) --- 446,456 ---- /** * Create a Get Command * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlGetCmd(InstanceID_t id, SmlGetPtr_t pContent) *************** *** 527,542 **** /** - * FUNCTION: smlPutCmd - * * Create a Put Command * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: PutPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlPutCmd(InstanceID_t id, SmlPutPtr_t pContent) --- 463,473 ---- /** * Create a Put Command * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlPutCmd(InstanceID_t id, SmlPutPtr_t pContent) *************** *** 548,563 **** /** - * FUNCTION: smlMapCmd - * * Create a Map Command * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: MapPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlMapCmd(InstanceID_t id, SmlMapPtr_t pContent) --- 479,489 ---- /** * Create a Map Command * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlMapCmd(InstanceID_t id, SmlMapPtr_t pContent) *************** *** 569,584 **** /** - * FUNCTION: smlResultsCmd - * * Create a Results Command * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: ResultsPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlResultsCmd(InstanceID_t id, SmlResultsPtr_t pContent) --- 495,505 ---- /** * Create a Results Command * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlResultsCmd(InstanceID_t id, SmlResultsPtr_t pContent) *************** *** 592,607 **** /** - * FUNCTION: smlStatusCmd - * * Create a Status Command * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: StatusPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlStatusCmd(InstanceID_t id, SmlStatusPtr_t pContent) --- 513,523 ---- /** * Create a Status Command * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlStatusCmd(InstanceID_t id, SmlStatusPtr_t pContent) *************** *** 613,628 **** /** - * FUNCTION: smlReplaceCmd - * * Create a Replace Command * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: SmlReplacePtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlReplaceCmd(InstanceID_t id, SmlReplacePtr_t pContent) --- 529,539 ---- /** * Create a Replace Command * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlReplaceCmd(InstanceID_t id, SmlReplacePtr_t pContent) *************** *** 637,652 **** /** - * FUNCTION: smlCopyCmd - * * Create a Copy Command * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: CopyPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlCopyCmd(InstanceID_t id, SmlCopyPtr_t pContent) --- 548,558 ---- /** * Create a Copy Command * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlCopyCmd(InstanceID_t id, SmlCopyPtr_t pContent) *************** *** 660,675 **** /** - * FUNCTION: smlExecCmd - * * Create a Exec Command * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: ExecPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlExecCmd(InstanceID_t id, SmlExecPtr_t pContent) --- 566,576 ---- /** * Create a Exec Command * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlExecCmd(InstanceID_t id, SmlExecPtr_t pContent) *************** *** 683,698 **** /** - * FUNCTION: smlSearchCmd - * * Create a Search Command * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN: SearchPtr_t ! * Data to pass along with that SyncML command ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlSearchCmd(InstanceID_t id, SmlSearchPtr_t pContent) --- 584,594 ---- /** * Create a Search Command * ! * @param id (IN) ! * ID of the used instance ! * @param pContent (IN) ! * Data to pass along with that SyncML command ! * @return Return Code */ SML_API Ret_t smlSearchCmd(InstanceID_t id, SmlSearchPtr_t pContent) *************** *** 711,725 **** #ifndef __SML_LITE__ /* these API calls are NOT included in the Toolkit lite version */ /** - * FUNCTION: smlStartEvaluation - * * Starts an evaluation run which prevents further API-Calls to write tags - * just the tag-sizes are calculated. Must be sopped via smlEndEvaluation * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlStartEvaluation(InstanceID_t id) --- 607,616 ---- #ifndef __SML_LITE__ /* these API calls are NOT included in the Toolkit lite version */ /** * Starts an evaluation run which prevents further API-Calls to write tags - * just the tag-sizes are calculated. Must be sopped via smlEndEvaluation * ! * @param id (IN) ! * ID of the used instance ! * @return Return Code */ SML_API Ret_t smlStartEvaluation(InstanceID_t id) *************** *** 751,767 **** /** - * FUNCTION: smlEndEvaluation - * * Stops an evaluation run which prevents further API-Calls to write tags - * the remaining free buffer size after all Tags are written is returned * ! * IN: InstanceID_t ! * ID of the used instance ! * ! * IN/OUT: MemSize_t ! * Size of free buffer for data after all tags are written ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlEndEvaluation(InstanceID_t id, MemSize_t *freemem) --- 642,653 ---- /** * Stops an evaluation run which prevents further API-Calls to write tags - * the remaining free buffer size after all Tags are written is returned * ! * @param id (IN) ! * ID of the used instance ! * @param freemem (IN/OUT) ! * Size of free buffer for data after all tags are written ! * @return Return Code */ SML_API Ret_t smlEndEvaluation(InstanceID_t id, MemSize_t *freemem) *************** *** 800,819 **** /** - * FUNCTION: * Calls the encoding routines of the Encoder Module for a given Command Type * and Command Content * ! * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * IN: ProtoElement_t ! * Type of the command (defined by the Proto Element Enumeration) ! * ! * IN: VoidPtr_t ! * Content of the command to encode ! * ! * RETURN: Return value, ! * SML_ERR_OK if command has been encoded successfully */ static Ret_t mgrCreateNextCommand(InstanceID_t id, SmlProtoElement_t cmdType, VoidPtr_t pContent) --- 686,700 ---- /** * Calls the encoding routines of the Encoder Module for a given Command Type * and Command Content * ! * @param id (IN) ! * ID of the Instance ! * @param cmdType (IN) ! * Type of the command (defined by the Proto Element Enumeration) ! * @param pContent (IN) ! * Content of the command to encode ! * @return Return value,\n ! * SML_ERR_OK if command has been encoded successfully */ static Ret_t mgrCreateNextCommand(InstanceID_t id, SmlProtoElement_t cmdType, VoidPtr_t pContent) Index: mgrcmddispatcher.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrcmddispatcher.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mgrcmddispatcher.c 14 Nov 2003 09:43:26 -0000 1.3 --- mgrcmddispatcher.c 24 May 2004 01:33:36 -0000 1.4 *************** *** 1,13 **** ! /*************************************************************************/ ! /* module: SyncML Command Dispatcher */ ! /* */ ! /* file: mgrcmddispatcher.c */ ! /* target system: all */ ! /* target OS: all */ ! /* */ ! /* Description: */ ! /* Core module for dispatching parsed commands and invoking callback */ ! /* functions of the application */ ! /*************************************************************************/ --- 1,11 ---- ! /** ! * @file ! * SyncML Command Dispatcher ! * ! * @target_system all ! * @target_os all ! * @description Core module for dispatching parsed commands and invoking ! * callback functions of the application ! */ *************** *** 96,117 **** /** - * FUNCTION: smlProcessData - * * Start the parsing of the XML code in the workspace buffer, * dispatches the interpreted command and calls the corresponding callback * functions provided by the application. * ! * IN: InstanceID_t ! * The SyncML instance id is used for referencing the ! * workspace buffer from the XML content is parsed ! * ! * IN: ProcessMode_t ! * Mode of processing, Defines, if only the first or next ! * XML command is parsed or if all commands are processed ! * subsequently until the end of the entire workspace buffer ! * is reached. The NEXT_COMMAND flag defines the blocking mode, ! * the ALL_COMMANDS tag defines the non-blocking mode. ! * ! * RETURN: Ret_t */ SML_API Ret_t smlProcessData(InstanceID_t id, SmlProcessMode_t mode) --- 94,111 ---- /** * Start the parsing of the XML code in the workspace buffer, * dispatches the interpreted command and calls the corresponding callback * functions provided by the application. * ! * @param id (IN) ! * The SyncML instance id is used for referencing the ! * workspace buffer from the XML content is parsed ! * @param mode (IN) ! * Mode of processing, Defines, if only the first or next ! * XML command is parsed or if all commands are processed ! * subsequently until the end of the entire workspace buffer ! * is reached. The NEXT_COMMAND flag defines the blocking mode, ! * the ALL_COMMANDS tag defines the non-blocking mode. ! * @return Return Code */ SML_API Ret_t smlProcessData(InstanceID_t id, SmlProcessMode_t mode) *************** *** 183,197 **** /** - * FUNCTION: * Parses the header information at the beginning of an SyncML document. * ! * IN: InstanceID ! * current InstanceID to pass to callback functions ! * ! * IN/OUT: InstanceInfo ! * state information of the given InstanceID (decoder state will be changed) ! * ! * RETURN: Return value of the Parser, ! * SML_ERR_OK if next command was handled successfully */ static Ret_t mgrProcessStartMessage(InstanceID_t id, InstanceInfoPtr_t pInstanceInfo) --- 177,189 ---- /** * Parses the header information at the beginning of an SyncML document. * ! * @param id (IN) ! * current InstanceID to pass to callback functions ! * @param pInstanceInfo (IN/OUT) ! * state information of the given InstanceID ! * (decoder state will be changed) ! * @return Return value of the Parser,\n ! * SML_ERR_OK if next command was handled successfully */ static Ret_t mgrProcessStartMessage(InstanceID_t id, InstanceInfoPtr_t pInstanceInfo) *************** *** 262,276 **** /** - * FUNCTION: * Parses the next Sync Command in the sync document. * ! * IN: InstanceID ! * current InstanceID to pass to callback functions ! * ! * IN: InstanceInfo ! * state information of the given InstanceID ! * ! * RETURN: Return value of the Parser of the called application callback, ! * SML_ERR_OK if next command was handled successfully */ static Ret_t mgrProcessNextCommand(InstanceID_t id, InstanceInfoPtr_t pInstanceInfo) --- 254,265 ---- /** * Parses the next Sync Command in the sync document. * ! * @param id (IN) ! * current InstanceID to pass to callback functions ! * @param pInstanceInfo (IN) ! * state information of the given InstanceID ! * @return Return value of the Parser of the called application callback,\n ! * SML_ERR_OK if next command was handled successfully */ static Ret_t mgrProcessNextCommand(InstanceID_t id, InstanceInfoPtr_t pInstanceInfo) Index: mgrinstancelist.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrinstancelist.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mgrinstancelist.c 2 May 2003 22:05:07 -0000 1.2 --- mgrinstancelist.c 24 May 2004 01:33:36 -0000 1.3 *************** *** 1,17 **** ! /*************************************************************************/ ! /* module: List of SyncML Instances */ ! /* */ ! /* file: mgrinstancelist.c */ ! /* target system: all */ ! /* target OS: all */ ! /* */ ! /* Description: */ ! /* This module handles an element list of type InstanceInfo. Each */ ! /* element is identified by the InstanceID. There are functions provided */ ! /* to add, find and remove InstanceInfo elements. */ ! /* This file is private to the core module. The InstanceInfo list is */ ! /* used by the Modules MGR, MGRCmdDispatcher, MGRCmdBuilder */ ! /* and MGRInstanceMgr. */ ! /*************************************************************************/ /* --- 1,15 ---- ! /** ! * @file ! * List of SyncML Instances ! * ! * @target_system all ! * @target_os all ! * @description This module handles an element list of type InstanceInfo. Each ! * element is identified by the InstanceID. There are functions provided ! * to add, find and remove InstanceInfo elements. ! * This file is private to the core module. The InstanceInfo list is ! * used by the Modules MGR, MGRCmdDispatcher, MGRCmdBuilder ! * and MGRInstanceMgr. ! */ /* *************** *** 97,108 **** /** - * FUNCTION: * Adds a new element to the list * ! * IN: InstanceInfoPtr_t ! * pointer to the structure to be be added to list ! * ! * RETURN: Return value, ! * SML_ERR_OK if element was added successfully */ Ret_t addInfo(InstanceInfoPtr_t pInfo) --- 95,104 ---- /** * Adds a new element to the list * ! * @param pInfo (IN) ! * pointer to the structure to be be added to list ! * @return Return value,\n ! * SML_ERR_OK if element was added successfully */ Ret_t addInfo(InstanceInfoPtr_t pInfo) *************** *** 135,147 **** /** - * FUNCTION: * Searches an element with the given InstanceID in the list * ! * IN: InstanceID_t ! * ID of the InstanceInfo structure to be retrieved ! * ! * RETURN: InstanceInfoPtr_t ! * Pointer to the InstanceInfo structure with the given ID ! * NULL, if no InstanceInfo with the given ID has been found */ InstanceInfoPtr_t findInfo(InstanceID_t id) --- 131,140 ---- /** * Searches an element with the given InstanceID in the list * ! * @param id (IN) ! * ID of the InstanceInfo structure to be retrieved ! * @return Pointer to the InstanceInfo structure with the given ID\n ! * NULL, if no InstanceInfo with the given ID has been found */ InstanceInfoPtr_t findInfo(InstanceID_t id) *************** *** 169,180 **** /** - * FUNCTION: * Removes an element with the given InstanceID from the list * ! * IN: InstanceID_t ! * ID of the InstanceInfo structure to be removed ! * ! * RETURN: Return value, ! * SML_ERR_OK if element was removed successfully */ Ret_t removeInfo(InstanceID_t id) --- 162,171 ---- /** * Removes an element with the given InstanceID from the list * ! * @param id (IN) ! * ID of the InstanceInfo structure to be removed ! * @return Return value,\n ! * SML_ERR_OK if element was removed successfully */ Ret_t removeInfo(InstanceID_t id) Index: mgr.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgr.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mgr.c 15 Apr 2004 12:06:15 -0000 1.4 --- mgr.c 24 May 2004 01:33:36 -0000 1.5 *************** *** 1,12 **** ! /*************************************************************************/ ! /* module: Managing SyncML */ ! /* */ ! /* file: mgr.c */ ! /* target system: all */ ! /* target OS: all */ ! /* */ ! /* Description: */ ! /* Core Module managing the life-cycle of a syncML Process itself */ ! /*************************************************************************/ --- 1,10 ---- ! /** ! * @file ! * Managing SyncML ! * ! * @target_system all ! * @target_os all ! * @description Core Module managing the life-cycle of a syncML Process itself ! */ *************** *** 109,122 **** /** - * FUNCTION: smlInit - * * Initializes the SyncML Reference Tookit. This is required, before any * other function can be used. * ! * IN: SyncMLOptionsPtr_t ! * options to be applied for the toolkit ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlInit(SmlOptionsPtr_t pCoreOptions) --- 107,116 ---- /** * Initializes the SyncML Reference Tookit. This is required, before any * other function can be used. * ! * @param pCoreOptions (IN) ! * options to be applied for the toolkit ! * @return Return Code */ SML_API Ret_t smlInit(SmlOptionsPtr_t pCoreOptions) *************** *** 189,201 **** /** - * FUNCTION: smlTerminate - * * Terminate SyncML. Frees all memory and other ressources used by * SyncML. This function must be called when terminating SyncML * ! * PRE-Condition: All instances must have been terminated ! * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlTerminate(void) { --- 183,191 ---- /** * Terminate SyncML. Frees all memory and other ressources used by * SyncML. This function must be called when terminating SyncML * ! * @pre All instances must have been terminated ! * @return Return Code */ SML_API Ret_t smlTerminate(void) { *************** *** 226,238 **** /** ! * FUNCTION: smlSetSyncMLOptions ! * ! * change the option settings for syncML ! * ! * IN: SyncMLOptionsPtr_t ! * options to be applied for the toolkit * ! * RETURN: Ret_t ! * Return Code */ SML_API Ret_t smlSetSyncMLOptions(SmlOptionsPtr_t pCoreOptions) { --- 216,224 ---- /** ! * Change the option settings for syncML * ! * @param pCoreOptions (IN) ! * options to be applied for the toolkit ! * @return Return Code */ SML_API Ret_t smlSetSyncMLOptions(SmlOptionsPtr_t pCoreOptions) { *************** *** 268,276 **** *************************************************************************/ /** ! * FUNCTION: mgrGetSyncMLInfo ! * Retrieves a pointer to the structure holding all global informations within SyncML * ! * RETURN: SyncMLInfoPtr_t ! * Pointer to the pGlobalAnchor */ SyncMLInfoPtr_t mgrGetSyncMLAnchor(void) --- 254,261 ---- *************************************************************************/ /** ! * Retrieves a pointer to the structure holding all global informations ! * within SyncML * ! * @return Pointer to the pGlobalAnchor */ SyncMLInfoPtr_t mgrGetSyncMLAnchor(void) *************** *** 280,288 **** /** - * FUNCTION: mgrGetInstanceListAnchor * Retrieves a pointer to the list holding all instance informations * ! * RETURN: InstanceInfoPtr_t ! * Pointer to the pInstanceListAnchor */ InstanceInfoPtr_t mgrGetInstanceListAnchor(void) --- 265,271 ---- /** * Retrieves a pointer to the list holding all instance informations * ! * @return Pointer to the pInstanceListAnchor */ InstanceInfoPtr_t mgrGetInstanceListAnchor(void) *************** *** 292,300 **** /** - * FUNCTION: mgrSetInstanceListAnchor * Set the pointer to the list holding all instance informations * ! * IN: InstanceInfoPtr_t ! * Pointer to the pInstanceListAnchor */ void mgrSetInstanceListAnchor(InstanceInfoPtr_t newListAnchor) --- 275,282 ---- /** * Set the pointer to the list holding all instance informations * ! * @param newListAnchor (IN) ! * pointer to the pInstanceListAnchor */ void mgrSetInstanceListAnchor(InstanceInfoPtr_t newListAnchor) Index: mgrinstancemgr.c =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/all/mgrinstancemgr.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mgrinstancemgr.c 2 May 2003 22:05:07 -0000 1.2 --- mgrinstancemgr.c 24 May 2004 01:33:36 -0000 1.3 *************** *** 1,12 **** ! /*************************************************************************/ ! /* module: Managing SyncML Instances */ ! /* */ ! /* file: mgrinstancemgr.c */ ! /* target system: all */ ! /* target OS: all */ ! /* */ ! /* Description: */ ! /* Core module for managing creation and usage of instances */ ! /*************************************************************************/ /* --- 1,11 ---- ! /** ! * @file ! * Managing SyncML Instances ! * ! * @target_system all ! * @target_os all ! * @description Core module for managing creation and usage of instances ! */ ! /* *************** *** 110,115 **** /** - * FUNCTION: smlInitInstance - * * Creates a SyncML instance and assigns a corresponding workspace buffer in * which XML documents are assembled or parsed. --- 109,112 ---- *************** *** 122,147 **** * is called. * ! * IN: SmlCallbacks_t ! * A structure holding references to the callback functions ! * implemented by the application ! * ! * IN: SmlInstanceOptionsPtr_t ! * Option settings of a particular SyncML instance ! * ! * IN: VoidPtr_t ! * UserData is a pointer to a void structure the application ! * can pass into the SyncML Toolkit instance info. ! * It will be returned to the application with every called ! * callback function call! ! * NOTE: This is only a pointer, the memory object itself ! * remains within the responsibility of the calling application. ! * The memory object will not be copied, moved or freed by the ! * Toolkit. ! * ! * OUT: InstanceID_t ! * Instance ID assigned to the initialized instance ! * ! * RETURN: Ret_t ! * Error Code */ SML_API Ret_t smlInitInstance(SmlCallbacksPtr_t pCallbacks, SmlInstanceOptionsPtr_t pOptions, VoidPtr_t pUserData, InstanceID_t *pInstanceID) --- 119,138 ---- * is called. * ! * @param pCallbacks (IN) ! * A structure holding references to the callback functions ! * implemented by the application ! * @param pOptions (IN) ! * Option settings of a particular SyncML instance ! * @param pUserData (IN) ! * UserData is a pointer to a void structure the application ! * can pass into the SyncML Toolkit instance info. It will ! * be returned to the application with every called callback ! * function call!\n ! * NOTE: This is only a pointer, the memory object itself ! * remains within the responsibility of the calling application. ! * The memory object will not be copied, moved or freed by the Toolkit. ! * @param pInstanceID (OUT) ! * Instance ID assigned to the initialized instance ! * @return Error Code */ SML_API Ret_t smlInitInstance(SmlCallbacksPtr_t pCallbacks, SmlInstanceOptionsPtr_t pOptions, VoidPtr_t pUserData, InstanceID_t *pInstanceID) *************** *** 274,287 **** /** - * FUNCTION: smlTerminateInstance - * * Terminates a SyncML instance. The instance info is removed from the instances ! * list. Allmemory allocated for the workspace and the options variables is freed. ! * ! * IN: InstanceID_t ! * ID of the instance to be terminated * ! * RETURN: Ret_t ! * Error Code */ SML_API Ret_t smlTerminateInstance (InstanceID_t id) --- 265,275 ---- /** * Terminates a SyncML instance. The instance info is removed from the instances ! * list. Allmemory allocated for the workspace and the options variables is ! * freed. * ! * @param id (IN) ! * ID of the instance to be terminated ! * @return Error Code */ SML_API Ret_t smlTerminateInstance (InstanceID_t id) *************** *** 334,350 **** /** - * FUNCTION: smlSetCallbacks - * * Sets new callback functions to an instance * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * IN: SmlCallbacksPtr_t ! * A structure holding references to the callback functions ! * implemented by the application ! * ! * RETURN: Return value, ! * SML_ERR_OK if successful */ SML_API Ret_t smlSetCallbacks(InstanceID_t id, SmlCallbacksPtr_t pCallbacks) --- 322,334 ---- /** * Sets new callback functions to an instance * ! * @param id (IN) ! * ID of the Instance ! * @param pCallbacks (IN) ! * A structure holding references to the callback functions ! * implemented by the application ! * @return Return value,\n ! * SML_ERR_OK if successful */ SML_API Ret_t smlSetCallbacks(InstanceID_t id, SmlCallbacksPtr_t pCallbacks) *************** *** 392,415 **** /** - * FUNCTION: smlSetUserData - * * Sets a new Pointer to application specific user data, * which is passed to all invoked callback functions * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * IN: VoidPtr_t ! * UserData is a pointer to a void structure the application ! * can pass into the SyncML Toolkit instance info. ! * It will be returned to the application with every called ! * callback function call! ! * NOTE: This is only a pointer, the memory object itself ! * remains within the responsibility of the calling application. ! * The memory object will not be copied, moved or freed by the ! * Toolkit. ! * ! * RETURN: Return value, ! * SML_ERR_OK if successful */ SML_API Ret_t smlSetUserData(InstanceID_t id, VoidPtr_t pUserData) --- 376,394 ---- /** * Sets a new Pointer to application specific user data, * which is passed to all invoked callback functions * ! * @param id (IN) ! * ID of the Instance ! * @param pUserData (IN) ! * UserData is a pointer to a void structure the application ! * can pass into the SyncML Toolkit instance info. It will ! * be returned to the application with every called callback ! * function call!\n ! * NOTE: This is only a pointer, the memory object itself ! * remains within the responsibility of the calling application. ! * The memory object will not be copied, moved or freed by the Toolkit. ! * @return Return value,\n ! * SML_ERR_OK if successful */ SML_API Ret_t smlSetUserData(InstanceID_t id, VoidPtr_t pUserData) *************** *** 442,458 **** /** - * FUNCTION: smlGetUserData (added by luz %%%) - * * Returns Pointer to application specific user data, * which is passed to all invoked callback functions * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * IN: *VoidPtr_t ! * Receives current Userdata pointer ! * ! * RETURN: Return value, ! * SML_ERR_OK if successful */ SML_API Ret_t smlGetUserData(InstanceID_t id, VoidPtr_t *ppUserData) --- 421,434 ---- /** * Returns Pointer to application specific user data, * which is passed to all invoked callback functions * ! * @param id (IN) ! * ID of the Instance ! * @param ppUserData (OUT) ! * Receives current Userdata pointer ! * @return Return value,\n ! * SML_ERR_OK if successful ! * @note (added by luz %%%) */ SML_API Ret_t smlGetUserData(InstanceID_t id, VoidPtr_t *ppUserData) *************** *** 484,499 **** /** - * FUNCTION: smlGetEncoding (added by luz %%%) - * * Returns Currently set encoding type * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * IN: *SmlEncoding_t ! * Receives current encoding ! * ! * RETURN: Return value, ! * SML_ERR_OK if successful */ SML_API Ret_t smlGetEncoding(InstanceID_t id, SmlEncoding_t *pEncoding) --- 460,472 ---- /** * Returns Currently set encoding type * ! * @param id (IN) ! * ID of the Instance ! * @param pEncoding (OUT) ! * Receives current encoding ! * @return Return value,\n ! * SML_ERR_OK if successful ! * @note (added by luz %%%) */ SML_API Ret_t smlGetEncoding(InstanceID_t id, SmlEncoding_t *pEncoding) *************** *** 524,539 **** /** - * FUNCTION: smlSetEncoding - * * Sets new encoding type for this Instance * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * IN: SmlEncoding_t ! * Type of Encoding to be used within this Instance ! * ! * RETURN: Return value, ! * SML_ERR_OK if successful */ #ifndef __SML_LITE__ /* these API calls are NOT included in the Toolkit lite version */ --- 497,508 ---- /** * Sets new encoding type for this Instance * ! * @param id (IN) ! * ID of the Instance ! * @param encoding (IN) ! * Type of Encoding to be used within this Instance ! * @return Return value,\n ! * SML_ERR_OK if successful */ #ifndef __SML_LITE__ /* these API calls are NOT included in the Toolkit lite version */ *************** *** 574,603 **** /** - * FUNCTION: smlLockReadBuffer - * * Locks the workspace buffer, which is assigned to the given instance * for reading. After this function is called, the application has * access to the workspace buffer, beginning at the address pReadPosition which * is returned by this function. SyncML will not change the workspace ! * buffer until smlUnlockReadBuffer is called. * pReadPosition returns a pointer to a valid position in the SyncML workspace * buffer. The pointer can be used by the application for copying outgoing * synchronization data from the buffer into some transport layer. usedSize * retrieves the size of synchronization data currently stored in the ! * workspace buffer beginning from the address to which pReadPosition points to. * This information is needed by the application when copying XML code out * of the buffer (while sending synchronization data) * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * OUT: MemPtr_t ! * Workspace Pointer from which data can be read ! * ! * OUT: MemSize_t ! * Size of used data in workspace which may be read ! * ! * RETURN: Return value, ! * SML_ERR_OK if successful */ SML_API Ret_t smlLockReadBuffer(InstanceID_t id, MemPtr_t *pReadPosition, MemSize_t *usedSize) --- 543,568 ---- /** * Locks the workspace buffer, which is assigned to the given instance * for reading. After this function is called, the application has * access to the workspace buffer, beginning at the address pReadPosition which * is returned by this function. SyncML will not change the workspace ! * buffer until smlUnlockReadBuffer is called.\n * pReadPosition returns a pointer to a valid position in the SyncML workspace * buffer. The pointer can be used by the application for copying outgoing * synchronization data from the buffer into some transport layer. usedSize * retrieves the size of synchronization data currently stored in the ! * workspace buffer beginning from the address to which pReadPosition points ! * to.\n * This information is needed by the application when copying XML code out * of the buffer (while sending synchronization data) * ! * @param id (IN) ! * ID of the Instance ! * @param pReadPosition (OUT) ! * Workspace Pointer from which data can be read ! * @param usedSize (OUT) ! * Size of used data in workspace which may be read ! * @return Return value,\n ! * SML_ERR_OK if successful */ SML_API Ret_t smlLockReadBuffer(InstanceID_t id, MemPtr_t *pReadPosition, MemSize_t *usedSize) *************** *** 640,660 **** /** - * FUNCTION: smlUnlockReadBuffer - * * End the read access of the application to the workspace buffer. ! * SyncML is now owner of the buffer again and is able to manipulate its contents. * processedBytes passes the number of bytes, which the application has * successfully read and processed (e.g. when the application has copied ! * outgoing synchronization data from the workspace into a communication module). * SyncML removes the given number of bytes from the workspace! * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * IN: MemSize_t ! * Actually read and processed bytes ! * ! * RETURN: Return value, ! * SML_ERR_OK if successful */ SML_API Ret_t smlUnlockReadBuffer(InstanceID_t id, MemSize_t processedBytes) --- 605,623 ---- /** * End the read access of the application to the workspace buffer. ! * SyncML is now owner of the buffer again and is able to manipulate its ! * contents.\n * processedBytes passes the number of bytes, which the application has * successfully read and processed (e.g. when the application has copied ! * outgoing synchronization data from the workspace into a communication ! * module).\n * SyncML removes the given number of bytes from the workspace! * ! * @param id (IN) ! * ID of the Instance ! * @param processedBytes (IN) ! * Actually read and processed bytes ! * @return Return value,\n ! * SML_ERR_OK if successful */ SML_API Ret_t smlUnlockReadBuffer(InstanceID_t id, MemSize_t processedBytes) *************** *** 703,719 **** /** ! * FUNCTION: smlSetMaxOutgoingSize ! * ! * marks the current write pointer position as beginning of a new outgoing * message. This is used to track outgoing message size while writing it * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * IN: MemSize_t ! * maximum size of outgoing message (0=no limit except buffer size) ! * ! * RETURN: Return value, ! * SML_ERR_OK if successful */ SML_API Ret_t smlSetMaxOutgoingSize(InstanceID_t id, MemSize_t maxOutgoingSize) --- 666,679 ---- /** ! * Marks the current write pointer position as beginning of a new outgoing * message. This is used to track outgoing message size while writing it * ! * @param id (IN) ! * ID of the Instance ! * @param maxOutgoingSize (IN) ! * maximum size of outgoing message ! * (0=no limit except buffer size) ! * @return Return value,\n ! * SML_ERR_OK if successful */ SML_API Ret_t smlSetMaxOutgoingSize(InstanceID_t id, MemSize_t maxOutgoingSize) *************** *** 732,745 **** /** ! * FUNCTION: smlSetOutgoingBegin ! * ! * marks the current write pointer position as beginning of a new outgoing * message. This is used to track outgoing message size while writing it * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * RETURN: Return value, ! * SML_ERR_OK if successful */ SML_API Ret_t smlSetOutgoingBegin(InstanceID_t id) --- 692,702 ---- /** ! * Marks the current write pointer position as beginning of a new outgoing * message. This is used to track outgoing message size while writing it * ! * @param id (IN) ! * ID of the Instance ! * @return Return value,\n ! * SML_ERR_OK if successful */ SML_API Ret_t smlSetOutgoingBegin(InstanceID_t id) *************** *** 759,764 **** /** - * FUNCTION: smlLockWriteBuffer - * * Locks the workspace buffer, which is assigned to the given * instance for writing. After this function is called, the --- 716,719 ---- *************** *** 776,790 **** * receiving synchronization data) * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * OUT: MemPtr_t ! * Workspace Pointer to which data can be written ! * ! * OUT: MemSize_t ! * Max free Size of available space for data ! * ! * RETURN: Return value, ! * SML_ERR_OK if successful */ SML_API Ret_t smlLockWriteBuffer(InstanceID_t id, MemPtr_t *pWritePosition, MemSize_t *freeSize) --- 731,742 ---- * receiving synchronization data) * ! * @param id (IN) ! * ID of the Instance ! * @param pWritePosition (OUT) ! * Workspace Pointer to which data can be written ! * @param freeSize (OUT) ! * Max free Size of available space for data ! * @return Return value,\n ! * SML_ERR_OK if successful */ SML_API Ret_t smlLockWriteBuffer(InstanceID_t id, MemPtr_t *pWritePosition, MemSize_t *freeSize) *************** *** 848,852 **** /** - * FUNCTION: smlUnlockWriteBuffer * * End the write access of the application to the workspace buffer. --- 800,803 ---- *************** *** 858,869 **** * synchronization data. * ! * IN: InstanceID_t ! * ID of the Instance ! * ! * IN: MemSize_t ! * Actually written bytes ! * ! * RETURN: Return value, ! * SML_ERR_OK if successful */ SML_API Ret_t smlUnlockWriteBuffer(InstanceID_t id, MemSize_t writtenBytes) --- 809,818 ---- * synchronization data. * ! * @param id (IN) ! * ID of the Instance ! * @param writtenBytes (IN) ! * Actually written bytes ! * @return Return value,\n ! * SML_ERR_OK if successful */ SML_API Ret_t smlUnlockWriteBuffer(InstanceID_t id, MemSize_t writtenBytes) *************** *** 916,927 **** /** - * FUNCTION: mgrResetWorkspace * Reset the Workspace Buffer position to the beginning of the workspace * (clears all data in the buffer) * ! * IN: InstanceID_t ! * ID of the Instance ! * RETURN: Return value, ! * SML_ERR_OK if successful */ Ret_t mgrResetWorkspace (InstanceID_t id) { --- 865,875 ---- /** * Reset the Workspace Buffer position to the beginning of the workspace * (clears all data in the buffer) * ! * @param id (IN) ! * ID of the Instance ! * @return Return value,\n ! * SML_ERR_OK if successful */ Ret_t mgrResetWorkspace (InstanceID_t id) { *************** *** 948,967 **** /** ! * FUNCTION: setInstanceOptions ! * ! * the options settings of an instance are set to a new value ! * ! * IN: InstanceID_t ! * Instance ID assigned to the instance ! * ! * IN: SmlInstanceOptionsPtr_t ! * New option settings of that particular SyncML ins... [truncated message content] |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:18
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/lib/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/sml/lib/inc Modified Files: liblock.h libmem.h libstr.h libutil.h Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: libstr.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/lib/inc/libstr.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libstr.h 2 May 2003 22:05:07 -0000 1.2 --- libstr.h 24 May 2004 01:33:36 -0000 1.3 *************** *** 1,12 **** ! /*************************************************************************/ ! /* module: Library for String Functions */ ! /* */ ! /* file: libstr.h */ ! /* target system: ALL */ ! /* target OS: ALL */ ! /* */ ! /* Description: */ ! /* Header for the implementation of common string-handling functions */ ! /*************************************************************************/ --- 1,10 ---- ! /** ! * @file ! * Library for String Functions ! * ! * @target_system ALL ! * @target_os ALL ! * @description Header for the implementation of common string-handling functions ! */ Index: liblock.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/lib/inc/liblock.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** liblock.h 14 Nov 2003 09:43:26 -0000 1.2 --- liblock.h 24 May 2004 01:33:35 -0000 1.3 *************** *** 1,3 **** ! /* thread-locking library, RTK addition by lu...@sy... */ #ifndef LIBLOCK_H --- 1,10 ---- ! /** ! * @file ! * Library for Thread Locking Functions ! * ! * @target_system ALL ! * @target_os ALL ! * @description thread-locking library, RTK addition by lu...@sy... ! */ #ifndef LIBLOCK_H Index: libmem.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/lib/inc/libmem.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libmem.h 2 May 2003 22:05:07 -0000 1.2 --- libmem.h 24 May 2004 01:33:36 -0000 1.3 *************** *** 1,12 **** ! /*************************************************************************/ ! /* module: Library for Memory Functions */ ! /* */ ! /* file: libmem.h */ ! /* target system: ALL */ ! /* target OS: ALL */ ! /* */ ! /* Description: */ ! /* Header for the implementation of common memory handling functions */ ! /*************************************************************************/ --- 1,10 ---- ! /** ! * @file ! * Library for Memory Functions ! * ! * @target_system ALL ! * @target_os ALL ! * @description Header for the implementation of common memory handling functions ! */ Index: libutil.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/lib/inc/libutil.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libutil.h 2 May 2003 22:05:07 -0000 1.2 --- libutil.h 24 May 2004 01:33:36 -0000 1.3 *************** *** 1,12 **** ! /*************************************************************************/ ! /* module: Library for utility Functions */ ! /* */ ! /* file: libutil.c */ ! /* target system: ALL */ ! /* target OS: ALL */ ! /* */ ! /* Description: */ ! /* Some I/O Utilities */ ! /*************************************************************************/ --- 1,10 ---- ! /** ! * @file ! * Library for utility Functions ! * ! * @target_system ALL ! * @target_os ALL ! * @description Some I/O Utilities ! */ |
|
From: Kidong L. <bri...@us...> - 2004-05-24 01:34:18
|
Update of /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/src/sml/mgr/inc Modified Files: mgr.h mgrutil.h Log Message: Modified comments to doxygen-readable Removed duplicated comments Index: mgrutil.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/inc/mgrutil.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mgrutil.h 14 Nov 2003 09:43:26 -0000 1.3 --- mgrutil.h 24 May 2004 01:33:36 -0000 1.4 *************** *** 1,12 **** ! /*************************************************************************/ ! /* module: SyncML API for freeing SyncML C structures */ ! /* */ ! /* file: mgrutil.h */ ! /* target system: all */ ! /* target OS: all */ ! /* */ ! /* Description: */ ! /* Definitions for internal use within the SyncML implementation */ ! /*************************************************************************/ --- 1,10 ---- ! /** ! * @file ! * SyncML API for freeing SyncML C structures ! * ! * @target_system all ! * @target_os all ! * @description Definitions for internal use within the SyncML implementation ! */ Index: mgr.h =================================================================== RCS file: /cvsroot/syncml-ctoolkit/toolkit/src/sml/mgr/inc/mgr.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mgr.h 17 Apr 2004 09:30:41 -0000 1.3 --- mgr.h 24 May 2004 01:33:36 -0000 1.4 *************** *** 1,12 **** ! /*************************************************************************/ ! /* module: SyncML internal API of the MGR module */ ! /* */ ! /* file: mgr.h */ ! /* target system: all */ ! /* target OS: all */ ! /* */ ! /* Description: */ ! /* Definitions for internal use within the SyncML implementation */ ! /*************************************************************************/ --- 1,10 ---- ! /** ! * @file ! * SyncML internal API of the MGR module ! * ! * @target_system all ! * @target_os all ! * @description Definitions for internal use within the SyncML implementation ! */ *************** *** 74,85 **** /** * Current instance status ! **/ typedef enum { ! MGR_IDLE, // instance is idle (available for usage by applications) ! MGR_USED, // instance is in use, but currently inactive ! MGR_RECEIVE, // actively used for receiving (locked by application) ! MGR_SEND, // actively used for sending (locked by application) ! MGR_ENCODING, // actively used for encoding (locked by SyncML) ! MGR_DECODING // actively used for decoding (locked by SyncML) } InstanceStatus_t; --- 72,83 ---- /** * Current instance status ! */ typedef enum { ! MGR_IDLE, /**< instance is idle (available for usage by applications) */ ! MGR_USED, /**< instance is in use, but currently inactive */ ! MGR_RECEIVE, /**< actively used for receiving (locked by application) */ ! MGR_SEND, /**< actively used for sending (locked by application) */ ! MGR_ENCODING, /**< actively used for encoding (locked by SyncML) */ ! MGR_DECODING /**< actively used for decoding (locked by SyncML) */ } InstanceStatus_t; *************** *** 88,125 **** /** * structure describing the current status of an instance, ! **/ typedef struct instance_info_s { #ifndef NOWSM ! InstanceID_t id; // unique ID of the instance ! MemPtr_t workspaceHandle; // handle to the first position of the assigned workspace memory #else // buffer pointers for NOWSM simplified case ! MemPtr_t instanceBuffer; // pointer to instance work buffer ! MemSize_t instanceBufSiz; // size of currently allocated buffer ! Byte_t readLocked; // set when buffer is locked for read ! Byte_t writeLocked; // set when buffer is locked for read ! MemPtr_t readPointer; // read pointer ! MemPtr_t writePointer; // write pointer ! MemPtr_t outgoingMsgStart; // set whenever a smlStartMessage is issued, NULL when invalid ! MemSize_t maxOutgoingSize; // if<>0, smlXXXCmd will not modify the buffer when there's not enough room #endif ! InstanceStatus_t status; // current internal state of instance ! SmlCallbacksPtr_t callbacks; // Defined callback refererences for this Instance ! SmlInstanceOptionsPtr_t instanceOptions; // Defined options for this Instance (e.g. encoding type) ! VoidPtr_t userData; // Pointer to a structure, which is passed to the invoked callback functions #ifndef NOWSM ! VoidPtr_t workspaceState; // Pointer to a structure defining the current workspace status #endif ! VoidPtr_t encoderState; // Pointer to a structure defining the current encoder status ! VoidPtr_t decoderState; // Pointer to a structure defining the current decoder status #ifndef NOWSM ! struct instance_info_s* nextInfo; // Pointer to next Instance Info in a list #else ! smlPrintFunc defaultPrintFunc; // default application callback for displaying strings (is a global in original version) #endif } *InstanceInfoPtr_t, InstanceInfo_t; ! /* Pointers to store the global Tag tables */ typedef struct tokeninfo_s { TagPtr_t SyncML; --- 86,123 ---- /** * structure describing the current status of an instance, ! */ typedef struct instance_info_s { #ifndef NOWSM ! InstanceID_t id; /**< unique ID of the instance */ ! MemPtr_t workspaceHandle; /**< handle to the first position of the assigned workspace memory */ #else // buffer pointers for NOWSM simplified case ! MemPtr_t instanceBuffer; /**< pointer to instance work buffer */ ! MemSize_t instanceBufSiz; /**< size of currently allocated buffer */ ! Byte_t readLocked; /**< set when buffer is locked for read */ ! Byte_t writeLocked; /**< set when buffer is locked for read */ ! MemPtr_t readPointer; /**< read pointer */ ! MemPtr_t writePointer; /**< write pointer */ ! MemPtr_t outgoingMsgStart; /**< set whenever a smlStartMessage is issued, NULL when invalid */ ! MemSize_t maxOutgoingSize; /**< if<>0, smlXXXCmd will not modify the buffer when there's not enough room */ #endif ! InstanceStatus_t status; /**< current internal state of instance */ ! SmlCallbacksPtr_t callbacks; /**< Defined callback refererences for this Instance */ ! SmlInstanceOptionsPtr_t instanceOptions; /**< Defined options for this Instance (e.g. encoding type) */ ! VoidPtr_t userData; /**< Pointer to a structure, which is passed to the invoked callback functions */ #ifndef NOWSM ! VoidPtr_t workspaceState; /**< Pointer to a structure defining the current workspace status */ #endif ! VoidPtr_t encoderState; /**< Pointer to a structure defining the current encoder status */ ! VoidPtr_t decoderState; /**< Pointer to a structure defining the current decoder status */ #ifndef NOWSM ! struct instance_info_s* nextInfo; /**< Pointer to next Instance Info in a list */ #else ! smlPrintFunc defaultPrintFunc; /**< default application callback for displaying strings (is a global in original version) */ #endif } *InstanceInfoPtr_t, InstanceInfo_t; ! /** Pointers to store the global Tag tables */ typedef struct tokeninfo_s { TagPtr_t SyncML; *************** *** 134,142 **** * structure describing the current status of the global syncml module * (holds all global variables within SyncML) ! **/ typedef struct syncml_info_s { ! InstanceInfoPtr_t instanceListAnchor;// Anchor of the global list of known SyncML instances ! SmlOptionsPtr_t syncmlOptions; // Options valid for this SyncML Process ! WsmGlobalsPtr_t wsmGlobals; // Workspace global variables TokenInfoPtr_t tokTbl; } *SyncMLInfoPtr_t, SyncMLInfo_t; --- 132,140 ---- * structure describing the current status of the global syncml module * (holds all global variables within SyncML) ! */ typedef struct syncml_info_s { ! InstanceInfoPtr_t instanceListAnchor;/**< Anchor of the global list of known SyncML instances */ ! SmlOptionsPtr_t syncmlOptions; /**< Options valid for this SyncML Process */ ! WsmGlobalsPtr_t wsmGlobals; /**< Workspace global variables */ TokenInfoPtr_t tokTbl; } *SyncMLInfoPtr_t, SyncMLInfo_t; *************** *** 153,161 **** /** - * FUNCTION: mgrGetSyncMLInfo * Retrieves a pointer to the structure holding all global informations within SyncML * ! * RETURN: SyncMLInfoPtr_t ! * Pointer to the pGlobalAnchor */ SyncMLInfoPtr_t mgrGetSyncMLAnchor(void); --- 151,157 ---- /** * Retrieves a pointer to the structure holding all global informations within SyncML * ! * @return Pointer to the pGlobalAnchor */ SyncMLInfoPtr_t mgrGetSyncMLAnchor(void); *************** *** 163,171 **** /** - * FUNCTION: mgrGetInstanceListAnchor * Retrieves a pointer to the list holding all instance informations * ! * RETURN: InstanceInfoPtr_t ! * Pointer to the pInstanceListAnchor */ InstanceInfoPtr_t mgrGetInstanceListAnchor(void); --- 159,165 ---- /** * Retrieves a pointer to the list holding all instance informations * ! * @return Pointer to the pInstanceListAnchor */ InstanceInfoPtr_t mgrGetInstanceListAnchor(void); *************** *** 173,181 **** /** - * FUNCTION: mgrSetInstanceListAnchor * Set the pointer to the list holding all instance informations * ! * IN: InstanceInfoPtr_t ! * Pointer to the pInstanceListAnchor */ void mgrSetInstanceListAnchor(InstanceInfoPtr_t newListAnchor); --- 167,174 ---- /** * Set the pointer to the list holding all instance informations * ! * @param newListAnchor (IN) ! * pointer to the pInstanceListAnchor */ void mgrSetInstanceListAnchor(InstanceInfoPtr_t newListAnchor); |