external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code

Browse source
This commit is contained in:
Peter Howkins 2012-08-15 17:07:35 +01:00
commit 91b33b7158
131 changed files with 577 additions and 6840 deletions
Download patch file Download diff file Expand all files Collapse all files

217
cde/.gitignore vendored
View file

@ -8,12 +8,14 @@
# Backups and editor created backups
*.bak
*~
.depend
# flags for saying directory is complete
DONE
# imports of of headers
imports/x11
imports/motif
# exports of libraries/headers
exports
@ -77,6 +79,7 @@ programs/dsdm/dsdm
programs/dtaction/dtaction
programs/dtappintegrate/dtappintegrate
programs/dtcalc/dtcalc
programs/dtcm/libDtCmP/y.tab.h
programs/dtexec/dtexec
programs/dthello/Dthello
programs/dthello/dthello
@ -131,6 +134,16 @@ programs/dtwm/dtwm
programs/localized/C/types/*.dt
programs/localized/C/types/*.dt.tmsg
programs/localized/C/types/*.nls
programs/localized/ls /msg/*.nls
programs/localized/de_DE.ISO8859-1/msg/*.tmp.msg
programs/localized/es_ES.ISO8859-1/msg/*.tmp.msg
programs/localized/fr_FR.ISO8859-1/msg/*.tmp.msg
programs/localized/it_IT.ISO8859-1/msg/*.tmp.msg
programs/localized/ja_JP.dt-eucJP/msg/*.tmp.msg
programs/localized/ko_KR.dt-eucKR/msg/*.tmp.msg
programs/localized/sv_SE.ISO8859-1/msg/*.tmp.msg
programs/localized/zh_CN.dt-eucCN/msg/*.tmp.msg
programs/localized/zh_TW.dt-eucTW/msg/*.tmp.msg
# dtappbuilder
programs/dtappbuilder/src/ab/.dtcodegen.log
@ -754,6 +767,7 @@ programs/dtinfo/tools/misc/dfiles
programs/dtinfo/tools/misc/pmaker
# program/dtksh
programs/dtksh/dtksh
programs/dtksh/examples/CallDataTest4
programs/dtksh/examples/CallbackTest2
programs/dtksh/examples/DtCursorTest2
@ -775,6 +789,205 @@ programs/dtksh/examples/WorkProcTest1
programs/dtksh/examples/XCursorTest1
programs/dtksh/examples/XdrawTest
programs/dtksh/examples/crMovesText1
programs/dtksh/ksh93/bin
programs/dtksh/ksh93/include
programs/dtksh/ksh93/lib
programs/dtksh/ksh93/man/man1/sh.1
programs/dtksh/ksh93/man/man1/sh.1.old
programs/dtksh/ksh93/man/man3/LIBAST.3
programs/dtksh/ksh93/man/man3/LIBAST.3.old
programs/dtksh/ksh93/man/man3/ast.3
programs/dtksh/ksh93/man/man3/ast.3.old
programs/dtksh/ksh93/man/man3/chr.3
programs/dtksh/ksh93/man/man3/chr.3.old
programs/dtksh/ksh93/man/man3/compatibility.3
programs/dtksh/ksh93/man/man3/compatibility.3.old
programs/dtksh/ksh93/man/man3/error.3
programs/dtksh/ksh93/man/man3/error.3.old
programs/dtksh/ksh93/man/man3/find.3
programs/dtksh/ksh93/man/man3/find.3.old
programs/dtksh/ksh93/man/man3/fmt.3
programs/dtksh/ksh93/man/man3/fmt.3.old
programs/dtksh/ksh93/man/man3/fmtls.3
programs/dtksh/ksh93/man/man3/fmtls.3.old
programs/dtksh/ksh93/man/man3/fs3d.3
programs/dtksh/ksh93/man/man3/fs3d.3.old
programs/dtksh/ksh93/man/man3/ftwalk.3
programs/dtksh/ksh93/man/man3/ftwalk.3.old
programs/dtksh/ksh93/man/man3/getcwd.3
programs/dtksh/ksh93/man/man3/getcwd.3.old
programs/dtksh/ksh93/man/man3/hash.3
programs/dtksh/ksh93/man/man3/hash.3.old
programs/dtksh/ksh93/man/man3/iblocks.3
programs/dtksh/ksh93/man/man3/iblocks.3.old
programs/dtksh/ksh93/man/man3/int.3
programs/dtksh/ksh93/man/man3/int.3.old
programs/dtksh/ksh93/man/man3/magic.3
programs/dtksh/ksh93/man/man3/magic.3.old
programs/dtksh/ksh93/man/man3/mem.3
programs/dtksh/ksh93/man/man3/mem.3.old
programs/dtksh/ksh93/man/man3/modecanon.3
programs/dtksh/ksh93/man/man3/modecanon.3.old
programs/dtksh/ksh93/man/man3/nval.3
programs/dtksh/ksh93/man/man3/nval.3.old
programs/dtksh/ksh93/man/man3/optget.3
programs/dtksh/ksh93/man/man3/optget.3.old
programs/dtksh/ksh93/man/man3/path.3
programs/dtksh/ksh93/man/man3/path.3.old
programs/dtksh/ksh93/man/man3/preroot.3
programs/dtksh/ksh93/man/man3/preroot.3.old
programs/dtksh/ksh93/man/man3/proc.3
programs/dtksh/ksh93/man/man3/proc.3.old
programs/dtksh/ksh93/man/man3/re.3
programs/dtksh/ksh93/man/man3/re.3.old
programs/dtksh/ksh93/man/man3/setenviron.3
programs/dtksh/ksh93/man/man3/setenviron.3.old
programs/dtksh/ksh93/man/man3/sfdisc.3
programs/dtksh/ksh93/man/man3/sfdisc.3.old
programs/dtksh/ksh93/man/man3/sfio.3
programs/dtksh/ksh93/man/man3/sfio.3.old
programs/dtksh/ksh93/man/man3/sig.3
programs/dtksh/ksh93/man/man3/sig.3.old
programs/dtksh/ksh93/man/man3/spawnveg.3
programs/dtksh/ksh93/man/man3/spawnveg.3.old
programs/dtksh/ksh93/man/man3/stak.3
programs/dtksh/ksh93/man/man3/stak.3.old
programs/dtksh/ksh93/man/man3/stk.3
programs/dtksh/ksh93/man/man3/stk.3.old
programs/dtksh/ksh93/man/man3/strcopy.3
programs/dtksh/ksh93/man/man3/strcopy.3.old
programs/dtksh/ksh93/man/man3/strdup.3
programs/dtksh/ksh93/man/man3/strdup.3.old
programs/dtksh/ksh93/man/man3/strelapsed.3
programs/dtksh/ksh93/man/man3/strelapsed.3.old
programs/dtksh/ksh93/man/man3/strerror.3
programs/dtksh/ksh93/man/man3/strerror.3.old
programs/dtksh/ksh93/man/man3/stresc.3
programs/dtksh/ksh93/man/man3/stresc.3.old
programs/dtksh/ksh93/man/man3/streval.3
programs/dtksh/ksh93/man/man3/streval.3.old
programs/dtksh/ksh93/man/man3/strgid.3
programs/dtksh/ksh93/man/man3/strgid.3.old
programs/dtksh/ksh93/man/man3/strmatch.3
programs/dtksh/ksh93/man/man3/strmatch.3.old
programs/dtksh/ksh93/man/man3/stropt.3
programs/dtksh/ksh93/man/man3/stropt.3.old
programs/dtksh/ksh93/man/man3/strperm.3
programs/dtksh/ksh93/man/man3/strperm.3.old
programs/dtksh/ksh93/man/man3/strsignal.3
programs/dtksh/ksh93/man/man3/strsignal.3.old
programs/dtksh/ksh93/man/man3/strsort.3
programs/dtksh/ksh93/man/man3/strsort.3.old
programs/dtksh/ksh93/man/man3/strtape.3
programs/dtksh/ksh93/man/man3/strtape.3.old
programs/dtksh/ksh93/man/man3/strton.3
programs/dtksh/ksh93/man/man3/strton.3.old
programs/dtksh/ksh93/man/man3/struid.3
programs/dtksh/ksh93/man/man3/struid.3.old
programs/dtksh/ksh93/man/man3/swap.3
programs/dtksh/ksh93/man/man3/swap.3.old
programs/dtksh/ksh93/man/man3/tab.3
programs/dtksh/ksh93/man/man3/tab.3.old
programs/dtksh/ksh93/man/man3/tm.3
programs/dtksh/ksh93/man/man3/tm.3.old
programs/dtksh/ksh93/man/man3/tok.3
programs/dtksh/ksh93/man/man3/tok.3.old
programs/dtksh/ksh93/man/man3/touch.3
programs/dtksh/ksh93/man/man3/touch.3.old
programs/dtksh/ksh93/man/man3/vdelta.3
programs/dtksh/ksh93/man/man3/vdelta.3.old
programs/dtksh/ksh93/man/man3/vecargs.3
programs/dtksh/ksh93/man/man3/vecargs.3.old
programs/dtksh/ksh93/man/man3/vmalloc.3
programs/dtksh/ksh93/man/man3/vmalloc.3.old
programs/dtksh/ksh93/ship/SHIPiffe.sh
programs/dtksh/ksh93/ship/SHIPin
programs/dtksh/ksh93/ship/SHIPop.c
programs/dtksh/ksh93/ship/SHIPprobe
programs/dtksh/ksh93/ship/SHIPproto.c
programs/dtksh/ksh93/ship/ksh93/950807/BUILT
programs/dtksh/ksh93/ship/ksh93/950807/ERROR
programs/dtksh/ksh93/ship/ksh93/in.log
programs/dtksh/ksh93/ship/lib0ast/950811/BUILT
programs/dtksh/ksh93/ship/lib0ast/950811/ERROR
programs/dtksh/ksh93/ship/lib0ast/in.log
programs/dtksh/ksh93/ship/libAST/930519/BUILT
programs/dtksh/ksh93/ship/libAST/930519/ERROR
programs/dtksh/ksh93/ship/libAST/in.log
programs/dtksh/ksh93/ship/libast/950811/BUILT
programs/dtksh/ksh93/ship/libast/950811/ERROR
programs/dtksh/ksh93/ship/libast/in.log
programs/dtksh/ksh93/ship/libcmd/950811/BUILT
programs/dtksh/ksh93/ship/libcmd/950811/ERROR
programs/dtksh/ksh93/ship/libcmd/in.log
programs/dtksh/ksh93/ship/libodelta/950811/BUILT
programs/dtksh/ksh93/ship/libodelta/950811/ERROR
programs/dtksh/ksh93/ship/libodelta/in.log
programs/dtksh/ksh93/ship/libvdelta/950811/BUILT
programs/dtksh/ksh93/ship/libvdelta/950811/ERROR
programs/dtksh/ksh93/ship/libvdelta/in.log
programs/dtksh/ksh93/ship/pax/950811/BUILT
programs/dtksh/ksh93/ship/pax/950811/ERROR
programs/dtksh/ksh93/ship/pax/in.log
programs/dtksh/ksh93/ship/shipiffe
programs/dtksh/ksh93/ship/shipop
programs/dtksh/ksh93/ship/shipproto
programs/dtksh/ksh93/src/cmd/ksh93/FEATURE/
programs/dtksh/ksh93/src/cmd/ksh93/MAM.list
programs/dtksh/ksh93/src/cmd/ksh93/MAM.time
programs/dtksh/ksh93/src/cmd/ksh93/ksh
programs/dtksh/ksh93/src/cmd/ksh93/ksh.msg
programs/dtksh/ksh93/src/cmd/ksh93/shcomp
programs/dtksh/ksh93/src/cmd/ksh93/suid_exec
programs/dtksh/ksh93/src/cmd/pax/FEATURE/
programs/dtksh/ksh93/src/cmd/pax/MAM.list
programs/dtksh/ksh93/src/cmd/pax/MAM.time
programs/dtksh/ksh93/src/lib/lib0ast/MAM.list
programs/dtksh/ksh93/src/lib/lib0ast/MAM.time
programs/dtksh/ksh93/src/lib/lib0ast/hostinfo
programs/dtksh/ksh93/src/lib/lib0ast/prototyped.h
programs/dtksh/ksh93/src/lib/libAST/MAM.list
programs/dtksh/ksh93/src/lib/libAST/MAM.time
programs/dtksh/ksh93/src/lib/libAST/prototyped.h
programs/dtksh/ksh93/src/lib/libast/FEATURE/
programs/dtksh/ksh93/src/lib/libast/MAM.list
programs/dtksh/ksh93/src/lib/libast/MAM.time
programs/dtksh/ksh93/src/lib/libast/align.h
programs/dtksh/ksh93/src/lib/libast/ast_botch.h
programs/dtksh/ksh93/src/lib/libast/ast_fcntl.h
programs/dtksh/ksh93/src/lib/libast/ast_fs.h
programs/dtksh/ksh93/src/lib/libast/ast_hdr.h
programs/dtksh/ksh93/src/lib/libast/ast_lib.h
programs/dtksh/ksh93/src/lib/libast/ast_mode.h
programs/dtksh/ksh93/src/lib/libast/ast_param.h
programs/dtksh/ksh93/src/lib/libast/ast_time.h
programs/dtksh/ksh93/src/lib/libast/ast_tty.h
programs/dtksh/ksh93/src/lib/libast/ast_types.h
programs/dtksh/ksh93/src/lib/libast/ast_unistd.h
programs/dtksh/ksh93/src/lib/libast/ast_wait.h
programs/dtksh/ksh93/src/lib/libast/conf
programs/dtksh/ksh93/src/lib/libast/conflib.h
programs/dtksh/ksh93/src/lib/libast/conflim.h
programs/dtksh/ksh93/src/lib/libast/confmap.c
programs/dtksh/ksh93/src/lib/libast/confmap.h
programs/dtksh/ksh93/src/lib/libast/confstr.c
programs/dtksh/ksh93/src/lib/libast/conftab.c
programs/dtksh/ksh93/src/lib/libast/conftab.h
programs/dtksh/ksh93/src/lib/libast/confuni.h
programs/dtksh/ksh93/src/lib/libast/int.h
programs/dtksh/ksh93/src/lib/libast/limits.h
programs/dtksh/ksh93/src/lib/libast/pathconf.c
programs/dtksh/ksh93/src/lib/libast/preroot.h
programs/dtksh/ksh93/src/lib/libast/sig.h
programs/dtksh/ksh93/src/lib/libast/sysconf.c
programs/dtksh/ksh93/src/lib/libcmd/FEATURE/
programs/dtksh/ksh93/src/lib/libcmd/MAM.list
programs/dtksh/ksh93/src/lib/libcmd/MAM.time
programs/dtksh/ksh93/src/lib/libcmd/cmd.req
programs/dtksh/ksh93/src/lib/libodelta/MAM.list
programs/dtksh/ksh93/src/lib/libodelta/MAM.time
programs/dtksh/ksh93/src/lib/libvdelta/MAM.list
programs/dtksh/ksh93/src/lib/libvdelta/MAM.time
# programs/dtlogin
programs/dtlogin/config/0060.dtsysenv
@ -844,6 +1057,10 @@ programs/dtwm/Dtwm.defs
programs/dtwm/dtfplist
programs/dtwm/sys.dtwmrc
# programs/ksh93
programs/dtksh/ksh93/man/man1/sh.1
programs/dtksh/ksh93/man/man3/nval.3
# programs/localized
programs/localized/C/types/*.dt
programs/localized/C/types/*.dt.tmsg

30
cde/admin/IntegTools/post_install/Imakefile
View file

@ -10,7 +10,8 @@ XCOMM $TOG: Imakefile /main/13 1998/03/11 16:20:10 mgreess $
TOOL_DIR = ../dbTools
DATABASE_DIR = ../../../databases
BUILD_UDB_TOOL = ./build_udb_list
BUILD_UDB_TOOL = $(SHELL) build_udb_list
UDB_TOOL = $(KORNSHELL) $(TOOL_DIR)/udbToAny.ksh
#ifdef HPArchitecture
PLATFORM = hp-ux
@ -22,6 +23,9 @@ SUBDIRS = linux
#ifdef OpenBSDArchitecture
PLATFORM = openbsd
#endif
#ifdef FreeBSDArchitecture
PLATFORM = freebsd
#endif
#ifdef RsArchitecture
PLATFORM = aix
SUBDIRS = ibm
@ -50,62 +54,62 @@ MakeSubdirs($(SUBDIRS))
all::
configHelp:: $(DATABASE_DIR)/CDE-HELP-C.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-C.udb > CDE-HELP-C.lst
$(BUILD_UDB_TOOL) CDE-HELP-C ../../..
configHelpPrg:: $(DATABASE_DIR)/CDE-HELP-PRG.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-PRG.udb > CDE-HELP-PRG.lst
$(BUILD_UDB_TOOL) CDE-HELP-PRG ../../..
configDemos:: $(DATABASE_DIR)/CDE-DEMOS.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-DEMOS.udb > CDE-DEMOS.lst
$(BUILD_UDB_TOOL) CDE-DEMOS ../../..
configFonts:: $(DATABASE_DIR)/CDE-FONTS.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-FONTS.udb > CDE-FONTS.lst
$(BUILD_UDB_TOOL) CDE-FONTS ../../..
configHelpRun:: $(DATABASE_DIR)/CDE-HELP-RUN.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-RUN.udb > CDE-HELP-RUN.lst
$(BUILD_UDB_TOOL) CDE-HELP-RUN ../../..
configIcons:: $(DATABASE_DIR)/CDE-ICONS.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-ICONS.udb > CDE-ICONS.lst
$(BUILD_UDB_TOOL) CDE-ICONS ../../..
configInc:: $(DATABASE_DIR)/CDE-INC.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-INC.udb > CDE-INC.lst
$(BUILD_UDB_TOOL) CDE-INC ../../..
configManDev:: $(DATABASE_DIR)/CDE-MAN-DEV.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MAN-DEV.udb > CDE-MAN-DEV.lst
$(BUILD_UDB_TOOL) CDE-MAN-DEV ../../..
configMan:: $(DATABASE_DIR)/CDE-MAN.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MAN.udb > CDE-MAN.lst
$(BUILD_UDB_TOOL) CDE-MAN ../../..
configMsgCat:: $(DATABASE_DIR)/CDE-MSG-C.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MSG-C.udb > CDE-MSG-C.lst
$(BUILD_UDB_TOOL) CDE-MSG-C ../../..
configPrg:: $(DATABASE_DIR)/CDE-PRG.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-PRG.udb > CDE-PRG.lst
$(BUILD_UDB_TOOL) CDE-PRG ../../..
configShlibs:: $(DATABASE_DIR)/CDE-SHLIBS.udb
$(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-SHLIBS.udb > CDE-SHLIBS.lst
$(BUILD_UDB_TOOL) CDE-SHLIBS ../../..

2
cde/admin/IntegTools/post_install/linux/configRun.src
View file

@ -343,7 +343,7 @@ DEFAULT_PRINTER="DtPrint"
then
awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh
else
[ -x /usr/sbin/inetd ] && /usr/sbin/inetd -s 2>/dev/null
[ -x /usr/sbin/inetd ] && /usr/sbin/inetd
fi
fi

2
cde/config/cf/FreeBSD.cf
View file

@ -30,6 +30,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#undef InstallCmd
#define InstallCmd /usr/bin/install
#undef KornShell
#define KornShell /usr/local/bin/ksh93
#define UseGas YES
#ifndef GccUsesGas

4
cde/config/cf/Imake.tmpl
View file

@ -180,6 +180,9 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef BourneShell /* to force shell in makefile */
#define BourneShell /bin/sh
#endif
#ifndef KornShell
#define KornShell /bin/ksh
#endif
#ifndef ConstructMFLAGS
#if SystemV
#define ConstructMFLAGS YES /* build MFLAGS from MAKEFLAGS */
@ -889,6 +892,7 @@ XCOMM the platform-specific parameters - edit site.def to change
PATHSEP = PathSeparator
SHELL = BourneShell
KORNSHELL = KornShell
TOP = TOPDIR
CURRENT_DIR = CURDIR

1
cde/config/cf/README
View file

@ -90,6 +90,7 @@ Imake.tmpl provides defaults for the following variables:
InstPgmFlags install flags for normal programs
InstUidFlags install flags for xterm to chown /dev/ptys
InstallCmd command to install files
KornShell command used to run Korn Shell
Krb5Includes where to include Kerberos header files from
Krb5Libraries where to load Kerberos libraries from
LdCmd command to run loader

4
cde/config/cf/site.def
View file

@ -67,8 +67,10 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
#ifdef AfterVendorCF
#ifndef X11ProjectRoot
# if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
# if defined(LinuxArchitecture)
# define X11ProjectRoot /usr
#elif defined(FreeBSDArchitecture)
# define X11ProjectRoot /usr/local
# else
# define X11ProjectRoot /X11
# endif

5
cde/databases/Imakefile
View file

@ -30,6 +30,9 @@ UDB_RELEASE_OPT = -ReleaseStream linux
#ifdef OpenBSDArchitecture
UDB_RELEASE_OPT = -ReleaseStream openbsd
#endif
#ifdef FreeBSDArchitecture
UDB_RELEASE_OPT = -ReleaseStream freebsd
#endif
/*
* Insure that symbols used in the .udb files are undefined for
@ -97,7 +100,7 @@ CONVERSION= -toDB
.udb.db:
@echo "making $*.db"
@$(RM) $*.db
$(TOOLSRC)/$(DBTOOLS)/udbToAny.ksh $(CONVERSION) $(UDB_RELEASE_OPT) $< > $*.db
$(KORNSHELL) $(TOOLSRC)/$(DBTOOLS)/udbToAny.ksh $(CONVERSION) $(UDB_RELEASE_OPT) $< > $*.db
all::

2
cde/lib/DtSearch/dtsrapi.c
View file

@ -314,10 +314,8 @@ int DtSearchInit (
aa_argv0 = argv0;
if (err_file)
aa_stderr = err_file;
#if defined(linux) || defined(CSRG_BASED)
else
aa_stderr = stderr;
#endif
sprintbuf = austext_malloc (SPRINTBUFSZ, PROGNAME "135", NULL);

4
cde/lib/DtSearch/globals.c
View file

@ -60,11 +60,7 @@
#include <stdio.h>
#include <nl_types.h>
#if defined(linux)
FILE *aa_stderr = NULL;
#else
FILE *aa_stderr = stderr;
#endif
char *aa_argv0 = "<argv0>";
nl_catd dtsearch_catd = (nl_catd) -1;
nl_catd austools_catd = (nl_catd) -1;

2
cde/lib/DtSearch/raima/vista.h
View file

@ -86,7 +86,7 @@
# define __SVR4_I386_ABI_L1__
#endif
#include <limits.h> /* pickup WORD_BIT, LONG_BIT */
#if defined(linux)
#if defined(linux) || defined(__FreeBSD__)
# undef __SVR4_I386_ABI_L1__
# ifndef WORD_BIT
# define WORD_BIT 32

4
cde/lib/DtTerm/TermPrim/Imakefile
View file

@ -109,6 +109,10 @@ LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
#endif
#ifdef FreeBSDArchitecture
LinkFile(TermPrimGetPty.c,TermPrimGetPty-bsd.c)
#endif
#ifdef OpenBSDArchitecture
LinkFile(TermPrimGetPty.c,TermPrimGetPty-bsd.c)
#endif

6
cde/lib/DtTerm/TermPrim/TermPrimDebug.c
View file

@ -39,10 +39,10 @@ static char rcs_id[] = "$XConsortium: TermPrimDebug.c /main/4 1996/11/21 19:58:1
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#if !defined(linux)
# include <varargs.h>
#else
#if defined(linux) || defined(CSRG_BASED)
# include <stdarg.h>
#else
# include <varargs.h>
#endif
#include "TermHeader.h"
#include "TermPrimDebug.h"

4
cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h
View file

@ -96,11 +96,11 @@
# define USE_TCSENDBREAK /* use tiocbreak() */
#endif /* LINUX_ARCHITECTURE */
#ifdef OPENBSD_ARCHITECTURE
#ifdef CSRG_BASED
# define HAS_SETEUID /* seteuid available */
# define HAS_SETREUID /* setreuid available */
# define USE_TCSENDBREAK /* use tiocbreak() */
#endif /* OPENBSD_ARCHITECTURE */
#endif /* CSRG_BASED */
#ifdef SUN_ARCHITECTURE
# define XOR_CAPS_LOCK /* xor caps lock and shift */

6
cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c
View file

@ -60,6 +60,12 @@ static char rcs_id[] = "$TOG: TermPrimSetUtmp.c /main/10 1998/04/03 17:11:42 mgr
#define UT_NO_pututline
#endif /* sun */
#ifdef __FreeBSD__
#define UT_UTMPX
#define UT_HOST ut_host
#define UT_NO_pututline
#endif
#ifdef sun
#define UT_UTMPX
#define UT_HOST ut_host

2
cde/lib/DtWidget/Imakefile
View file

@ -15,7 +15,7 @@ XCOMM $XConsortium: Imakefile /main/8 1996/04/21 19:11:16 drk $
DEFINES = DtWidgetDefines
#if defined(LinuxArchitecture)
INCLUDES = -I. -I/usr/include/freetype2
#elif defined(OpenBSDArchitecture)
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
INCLUDES = -I. -I$(XPROJECTROOT)/include/freetype2
#else
INCLUDES = -I.

6
cde/lib/csa/Imakefile
View file

@ -105,12 +105,6 @@ rtable3_clnt.c rtable3_xdr.c: rtable3.h namechange1.sed namechange2.sed
rtable2_clnt.c rtable2_xdr.c: rtable3.h namechange1.sed namechange2.sed
agent_xdr.c agent.c: agent.h
#ifdef LinuxArchitecture
EXTRASED=sed -e 's/update_failed.*=.*1,.*/update_failed = 1/g' |
#else
EXTRASED=
#endif
agent.h:
$(RM) $@
cat agent.wrapbegin > agent.h

8
cde/lib/csa/agent.c
View file

@ -156,15 +156,15 @@ _DtCm_init_agent()
}
if (registerrpc(_DtCm_transient, AGENTVERS, update_callback,
(char *(*)())_DtCm_update_callback_1, _DtCm_xdr_Table_Res_4,
_DtCm_xdr_Update_Status) == -1) {
(char *(*)())_DtCm_update_callback_1, (xdrproc_t)_DtCm_xdr_Table_Res_4,
(xdrproc_t)_DtCm_xdr_Update_Status) == -1) {
_DtCm_print_errmsg("Cannot register v1 callback handler\n");
_DtCm_print_errmsg("Callback cannot be enabled.\n");
}
if (registerrpc(_DtCm_transient, AGENTVERS_2, CMCB_UPDATE_CALLBACK,
(char *(*)())cmcb_update_callback_2_svc,
xdr_cmcb_update_callback_args, xdr_void) == -1) {
(xdrproc_t)xdr_cmcb_update_callback_args, (xdrproc_t)xdr_void) == -1) {
_DtCm_print_errmsg("Cannot register v2 callback handler\n");
_DtCm_print_errmsg("Callback cannot be enabled.\n");
}
@ -296,7 +296,7 @@ _DtCm_process_updates()
*/
Update_Status *
_DtCm_update_callback_1(Table_Res_4 *t, void *dummy)
_DtCm_update_callback_1(Table_Res_4 *t, _DtCm_Connection *conn)
{
static Update_Status status = update_succeeded;
_CallbackInfo *cbi;

8
cde/lib/csa/agent.wrapbegin
View file

@ -4,11 +4,3 @@
#if defined(HPUX)
#include <rpc/types.h>
#endif /* HPUX */
#if defined(linux) || defined(CSRG_BASED)
# if defined __STDC__
# define REDEFINE_STDC
# undef __STDC__
# endif
#endif /* linux */

7
cde/lib/csa/agent.wrapend
View file

@ -3,10 +3,3 @@
#define hpux
#endif
#endif
#if defined(linux)
# if defined REDEFINE_STDC
# undef REDEFINE_STDC
# define __STDC__
# endif
#endif /* linux */

2
cde/lib/csa/agent.x
View file

@ -32,6 +32,6 @@ enum Update_Status {
*/
program AGENTPROG {
version AGENTVERS {
Update_Status update_callback(Table_Res) = 1;
Update_Status update_callback(Table_Res_4) = 1;
}=1;
}=00;

2
cde/lib/csa/api.c
View file

@ -997,7 +997,7 @@ csa_list_entry_sequence(
rtype = &entry->e->attrs[CSA_ENTRY_ATTR_RECURRENCE_RULE_I];
if (rtype->value == NULL ||
rtype->value->item.string_value == NULL ||
*(rtype->value->item.string_value) == NULL) {
*(rtype->value->item.string_value) == '\0' ) {
return (CSA_E_INVALID_PARAMETER);
}
}

6
cde/lib/csa/attr.c
View file

@ -1907,8 +1907,8 @@ _CheckNameAtHost(char *owner, char *value)
return (CSA_E_FAILURE);
}
if (optr = strchr(owner, '@')) *optr = NULL;
if (ptr = strchr(value, '@')) *ptr = NULL;
if (optr = strchr(owner, '@')) *optr = '\0';
if (ptr = strchr(value, '@')) *ptr = '\0';
res = strcmp(value, owner);
if (optr) *optr = '@';
if (ptr) *ptr = '@';
@ -1965,7 +1965,7 @@ _CheckCalendarName(char *owner, char *cname, cms_attribute_value *val)
/* now make sure if cal name is a user name, it's
* the same as that of the calling user
*/
if (ptr = strchr(val->item.string_value, '@')) *ptr = NULL;
if (ptr = strchr(val->item.string_value, '@')) *ptr = '\0';
isuser = _DtCmIsUserName(val->item.string_value);
if (ptr) *ptr = '@';

8
cde/lib/csa/calendar.c
View file

@ -90,7 +90,7 @@ _DtCm_new_Calendar(const char *calendar)
if ((cal = (Calendar *)malloc(sizeof(Calendar))) == NULL)
return(NULL);
memset((void *)cal, NULL, sizeof(Calendar));
memset((void *)cal, 0, sizeof(Calendar));
if ((cal->name = strdup(calendar)) == NULL) {
free(cal);
@ -305,7 +305,7 @@ _DtCm_list_old_cal_attr_names(
for (i = 1, j = 0; i <= _DtCM_DEFINED_CAL_ATTR_SIZE; i++) {
if (_CSA_cal_attr_info[i].fst_vers > 0 &&
_CSA_cal_attr_info[i].fst_vers <= cal->file_version) {
if (i == CSA_CAL_ATTR_CALENDAR_OWNER_I && *buf == NULL)
if (i == CSA_CAL_ATTR_CALENDAR_OWNER_I && *buf == '\0')
continue;
if ((names[j] =
@ -527,7 +527,7 @@ _get_owner_from_old_cal(Calendar *cal, char *owner)
if (_DtCmIsUserName(calname) == B_TRUE)
strcpy(owner, calname);
else
*owner = NULL;
*owner = '\0';
free(calname);
return (CSA_SUCCESS);
@ -555,7 +555,7 @@ _get_calendar_owner(
} else {
if ((stat = _get_owner_from_old_cal(cal, buf)) != CSA_SUCCESS)
return (stat);
else if (*buf == NULL)
else if (*buf == '\0')
return (CSA_SUCCESS);
else
owner = buf;

2
cde/lib/csa/cmsdata.c
View file

@ -164,7 +164,7 @@ _DtCmGrowAttrArray(uint *num_attrs, cms_attribute **attrs, cms_attribute *attr)
return (CSA_E_INSUFFICIENT_MEMORY);
else {
*attrs = newptr;
memset((void *)&(*attrs)[*num_attrs+1], NULL,
memset((void *)&(*attrs)[*num_attrs+1], 0,
sizeof(cms_attribute) * (index - *num_attrs));
}

2
cde/lib/csa/convert4-5.c
View file

@ -378,7 +378,7 @@ _DtCmAttr4ToReminderValue(
_csa_duration_to_iso8601(atoi(remval->value), timestr);
rval.lead_time = timestr;
if (remval->clientdata && *remval->clientdata != NULL) {
if (remval->clientdata && *remval->clientdata != '\0') {
rval.reminder_data.size = strlen(remval->clientdata);
rval.reminder_data.data = (unsigned char *)remval->clientdata;
} else {

6
cde/lib/csa/convert5-4.c
View file

@ -92,11 +92,11 @@ _DtCm_cmsattrs_to_apptdata(uint size, cms_attribute *attrs, Appt_4 *appt)
{
strncpy(buf, (char *)aptr->value->item.opaque_data_value->data,
aptr->value->item.opaque_data_value->size);
buf[aptr->value->item.opaque_data_value->size] = NULL;
buf[aptr->value->item.opaque_data_value->size] = '\0';
ptr = strchr(buf, ':');
if (ptr != NULL)
*ptr = NULL;
*ptr = '\0';
appt->appt_id.key = atol(buf);
@ -819,7 +819,7 @@ _DtCm_add_reminder(char *rem, CSA_reminder * val, Appt_4 *appt)
}
memcpy(newattr->clientdata, val->reminder_data.data,
val->reminder_data.size);
newattr->clientdata[val->reminder_data.size] = NULL;
newattr->clientdata[val->reminder_data.size] = '\0';
} else if ((newattr->clientdata = calloc(1,1)) == NULL) {
_DtCm_free_attr4(newattr);

4
cde/lib/csa/entry.c
View file

@ -578,7 +578,7 @@ _DtCm_free_entry_content(uint dummy, _DtCm_libentry *entry)
{
_DtCm_remove_from_entry_list(entry->cal, (caddr_t)entry, (caddr_t)entry);
if (entry->e) _DtCm_free_cms_entry(entry->e);
memset((void *)entry, NULL, sizeof(_DtCm_libentry));
memset((void *)entry, 0, sizeof(_DtCm_libentry));
}
/*
@ -611,7 +611,7 @@ _DtCm_free_libentries(_DtCm_libentry *entry)
nptr = entry->next;
if (entry->e) _DtCm_free_cms_entry(entry->e);
memset((void *)entry, NULL, sizeof(_DtCm_libentry));
memset((void *)entry, 0, sizeof(_DtCm_libentry));
free(entry);

1
cde/lib/csa/free.h
View file

@ -33,6 +33,7 @@
#include <EUSCompat.h>
#include "ansi_c.h"
#include <sys/types.h>
extern CSA_calendar_user *_DtCm_alloc_calendar_users(uint num_elem);

2
cde/lib/csa/iso8601.c
View file

@ -318,7 +318,7 @@ _csa_iso8601_to_duration(char *buf, time_t *sec)
numptr = ptr;
while (*ptr >= '0' && *ptr <= '9') ptr++;
if (numptr == ptr || !(*ptr && *ptr++ == 'S' && *ptr == NULL))
if (numptr == ptr || !(*ptr && *ptr++ == 'S' && *ptr == '\0'))
return (-1);
else {
num = atoi(numptr);

14
cde/lib/csa/laccess.c
View file

@ -215,10 +215,10 @@ match_forward(char *str1, char *str2)
get_component(&str2, com2, '.');
if (*com1) {
if (*com2 == NULL)
if (*com2 == '\0')
return (B_TRUE);
} else {
if (*com2 == NULL)
if (*com2 == '\0')
return (B_TRUE);
else
return (B_FALSE);
@ -229,18 +229,18 @@ match_forward(char *str1, char *str2)
/* take care of case: a.b a. */
if (strcmp(str2, ".") == 0
&& (strcmp(str1, ".") != 0 || *str1 != NULL))
&& (strcmp(str1, ".") != 0 || *str1 != '\0'))
return (B_FALSE);
/* skip "." */
if (*str1 == '.') {
if (*str2 == NULL)
if (*str2 == '\0')
return (B_TRUE);
else {
str1++;
str2++;
}
} else if (strcmp(str2, ".") == 0 || *str2 == NULL)
} else if (strcmp(str2, ".") == 0 || *str2 == '\0')
return (B_TRUE);
else
return (B_FALSE);
@ -278,10 +278,10 @@ match_backward(char *str1, char *str2)
get_last_component(str2, &ptr2, com2, '.');
if (*com1) {
if (*com2 == NULL)
if (*com2 == '\0')
return (B_TRUE);
} else {
if (*com2 == NULL)
if (*com2 == '\0')
return (B_TRUE);
else
return (B_FALSE);

2
cde/lib/csa/lutil.c
View file

@ -69,7 +69,7 @@ _DtCmGetPrefix(char *str, char sep)
if (ptr == buf)
return(NULL);
else {
*ptr = NULL;
*ptr = '\0';
return(strdup(buf));
}
}

6
cde/lib/csa/match.c
View file

@ -1134,15 +1134,15 @@ contain_substr(char *str1, char *str2)
{
int i, len;
if (str2 == NULL || *str2 == NULL)
if (str2 == NULL || *str2 == '\0')
return (B_TRUE);
if (str1 == NULL || *str1 == NULL) {
if (str1 == NULL || *str1 == '\0') {
return (B_FALSE);
} else {
len = strlen(str2);
for (i = 0; str1[i] != NULL; i++) {
for (i = 0; str1[i] != '\0'; i++) {
if (strncasecmp(&str1[i], str2, len) == 0)
return (B_TRUE);
}

2
cde/lib/csa/nametbl.c
View file

@ -120,7 +120,7 @@ _DtCm_add_name_to_table(_DtCmNameTable *tbl, int index, char *newname)
return (CSA_E_INSUFFICIENT_MEMORY);
} else {
tbl->names = newptr;
memset((void *)&tbl->names[tbl->size+1], NULL,
memset((void *)&tbl->names[tbl->size+1], 0,
sizeof(char *)*(index - tbl->size));
}
}

4
cde/lib/csa/reparser.y
View file

@ -435,12 +435,12 @@ occurrence : FIRSTWEEK endMarker
endDate : /* empty */
{
$$ = NULL;
$$ = '\0';
}
| DATE
{
if (_csa_iso8601_to_tick($1, &$$) == -1)
$$ = NULL;
$$ = '\0';
}
;

4
cde/lib/csa/rpccalls.c
View file

@ -226,7 +226,7 @@ _DtCm_rpc_create_calendar(
/* check to make sure user is not creating a calendar
* using another user's name
*/
if (ptr = strchr(cal->name, '@')) *ptr = NULL;
if (ptr = strchr(cal->name, '@')) *ptr = '\0';
if (_DtCmIsUserName(cal->name) == B_TRUE) {
if ((owner = _DtCmGetUserName()) == NULL)
@ -1412,7 +1412,7 @@ _GetV4UserAccess(Calendar *cal, cms_access_entry *alist)
boolean_t isowner = B_FALSE;
/* first check if user is owner */
if (ptr = strchr(cal->name, '@')) *ptr = NULL;
if (ptr = strchr(cal->name, '@')) *ptr = '\0';
if (_DtCmIsUserName(cal->name) == B_TRUE) {
if (strcmp(user, cal->name) == 0) {

2
cde/lib/tt/lib/api/c/api_file.C
View file

@ -416,7 +416,7 @@ extern "C" {
}
Tt_status
_ttds_file_server(const char *filename, char **hostname)
_ttds_file_server(const char *filename, const char **hostname)
{
_Tt_c_file_ptr file;
_Tt_db_results dbresults;

6
cde/lib/tt/lib/api/c/api_storage.C
View file

@ -173,13 +173,13 @@ void _Tt_api_stg_stack_elm::
print(FILE *f) const
{
(void)fprintf(f,"_Tt_api_stg_stack_elm at %lx <",this);
(void)fprintf(f,"_Tt_api_stg_stack_elm at %p <",this);
switch (entry_type) {
case STACK_MARK:
(void)fprintf(f,"mark %ld>\n",addr);
(void)fprintf(f,"mark %p>\n",addr);
break;
case STACK_STORAGE:
(void)fprintf(f,"addr 0x%lx>\n",(long)addr);
(void)fprintf(f,"addr 0x%p>\n",addr);
break;
}
}

2
cde/lib/tt/lib/api/dnd/ttdnd.c
View file

@ -68,7 +68,6 @@ ttdnd_init(
{
int mark = tt_mark();
const char *t, **vt;
int validtypecount, i;
if (tt_ptr_error(tt_open())>TT_WRN_LAST) {
@ -238,7 +237,6 @@ _ttdnd_get_contents_callback(m, p)
Tt_message m;
Tt_pattern p;
{
int xid;
int chunknumber;
int maxchunk;
char *type;

2
cde/lib/tt/lib/db/db_server.h
View file

@ -276,7 +276,7 @@ bool_t xdr_Tt_oidaccess_results(XDR*, _Tt_oidaccess_results*);
struct _Tt_prop {
struct {
u_int propname_len;
char *propname_val;
const char *propname_val;
} propname;
long recnum;
struct {

6
cde/lib/tt/lib/db/db_server_clnt.C
View file

@ -1138,7 +1138,7 @@ _tt_get_all_sessions_1(_tt_get_all_sessions_args *argp, CLIENT * clnt)
{
static _tt_get_all_sessions_results res;
clnt_stat result = clnt_call(clnt, TT_GET_ALL_SESSIONS,
clnt_call(clnt, TT_GET_ALL_SESSIONS,
(xdrproc_t) xdr_tt_get_all_sessions_args,
(caddr_t) argp,
(xdrproc_t) xdr_tt_get_all_sessions_results,
@ -1153,7 +1153,7 @@ _tt_garbage_collect_1(void * /*NOTUSED*/, CLIENT *clnt)
{
static _tt_garbage_collect_results res;
clnt_stat result = clnt_call(clnt, TT_GARBAGE_COLLECT,
clnt_call(clnt, TT_GARBAGE_COLLECT,
(xdrproc_t) xdr_void, (caddr_t) NULL,
(xdrproc_t) xdr_tt_garbage_collect_results,
(caddr_t) &res,
@ -1167,7 +1167,7 @@ _tt_delete_session_1(_tt_delete_session_args * args, CLIENT *clnt)
{
static _tt_delete_session_results res;
clnt_stat result = clnt_call(clnt, TT_DELETE_SESSION,
clnt_call(clnt, TT_DELETE_SESSION,
(xdrproc_t) xdr_tt_delete_session_args,
(caddr_t) args,
(xdrproc_t) xdr_tt_delete_session_results,

2
cde/lib/tt/lib/db/old_db_server_functions.C
View file

@ -1523,7 +1523,7 @@ _tt_db_results *_tt_queue_message_1 (_tt_queue_msg_args *args,
_tt_get_rpc_strings(args->ptypes, message_info->ptypes);
// Get the XDR size of the new message info structure
u_int length;
u_int length = 0;
if (!message_info->xdr((XDR *)xdrsz)) {
results = TT_DB_ERR_ILLEGAL_MESSAGE;
}

2
cde/lib/tt/lib/db/tt_db_client.C
View file

@ -1247,7 +1247,6 @@ _Tt_db_client::dequeueMessages (const _Tt_string &file,
const _Tt_string_list_ptr &ptypes,
_Tt_message_list_ptr &messages)
{
_Tt_db_results retval;
_tt_dequeue_msgs_args args;
args.file = (char *)file;
@ -1265,7 +1264,6 @@ _Tt_db_client::dequeueMessages (const _Tt_string &file,
}
_tt_get_rpc_messages(results->messages, messages);
retval = results->results;
if (dbVersion==1) {
_tt_free_rpc_messages(results->messages);
} else {

2
cde/lib/tt/lib/db/tt_db_file.C
View file

@ -562,7 +562,7 @@ _Tt_string _Tt_db_file::getNetworkPath (const _Tt_string &file)
_Tt_string hostname;
_Tt_string partition;
_Tt_db_results results = _tt_db_network_path(file,
_tt_db_network_path(file,
local_path,
hostname,
partition,

2
cde/lib/tt/lib/db/tt_db_key.C
View file

@ -44,7 +44,7 @@
_Tt_db_key::_Tt_db_key (short version_number)
{
static long last_time_sec = 0;
static unsigned int last_time_sec = 0;
static long counter = 0;
key.version = version_number;

2
cde/lib/tt/lib/db/tt_db_rpc_message_routines.C
View file

@ -82,7 +82,7 @@ _tt_get_rpc_messages (const _tt_message_list &rpc_messages,
if (rpc_messages.messages_len) {
messages = new _Tt_message_list;
for (int i=0; i < rpc_messages.messages_len; i++) {
for (unsigned int i=0; i < rpc_messages.messages_len; i++) {
_Tt_message_ptr message_ptr;
_tt_get_rpc_message(rpc_messages.messages_val [i],

14
cde/lib/tt/lib/db/tt_db_rpc_routines.C
View file

@ -73,7 +73,7 @@ void _tt_free_rpc_message (const _tt_message &rpc_message)
void _tt_free_rpc_messages (const _tt_message_list &rpc_messages)
{
if (rpc_messages.messages_val) {
for (int i=0; i < rpc_messages.messages_len; i++) {
for (unsigned int i=0; i < rpc_messages.messages_len; i++) {
_tt_free_rpc_message(rpc_messages.messages_val [i]);
}
@ -84,7 +84,7 @@ void _tt_free_rpc_messages (const _tt_message_list &rpc_messages)
void _tt_free_rpc_strings (const _tt_string_list &rpc_strings)
{
if (rpc_strings.values_val) {
for (int i=0; i < rpc_strings.values_len; i++) {
for (unsigned int i=0; i < rpc_strings.values_len; i++) {
if (rpc_strings.values_val [i].value) {
free(rpc_strings.values_val [i].value);
}
@ -101,7 +101,7 @@ void _tt_free_rpc_property (const _tt_property &rpc_prop)
}
if (rpc_prop.values.values_val) {
for (int i=0; i < rpc_prop.values.values_len; i++) {
for (unsigned int i=0; i < rpc_prop.values.values_len; i++) {
if (rpc_prop.values.values_val [i].value.value_val) {
free(rpc_prop.values.values_val [i].value.value_val);
}
@ -114,7 +114,7 @@ void _tt_free_rpc_property (const _tt_property &rpc_prop)
void _tt_free_rpc_properties (const _tt_property_list &rpc_props)
{
if (rpc_props.properties_val) {
for (int i=0; i < rpc_props.properties_len; i++) {
for (unsigned int i=0; i < rpc_props.properties_len; i++) {
_tt_free_rpc_property(rpc_props.properties_val [i]);
}
@ -137,7 +137,7 @@ void _tt_get_rpc_strings (const _tt_string_list &rpc_strings,
strings = new _Tt_string_list;
if (rpc_strings.values_len) {
for (int i=0; i < rpc_strings.values_len; i++) {
for (unsigned int i=0; i < rpc_strings.values_len; i++) {
(void)strings->append(_Tt_string(rpc_strings.values_val [i].value));
}
}
@ -151,7 +151,7 @@ void _tt_get_rpc_property (const _tt_property &rpc_prop,
if (rpc_prop.name) {
prop->name = rpc_prop.name;
for (int i=0; i < rpc_prop.values.values_len; i++) {
for (unsigned int i=0; i < rpc_prop.values.values_len; i++) {
int prop_value_length = rpc_prop.values.values_val [i].value.value_len;
if (prop_value_length) {
_Tt_string prop_value(prop_value_length);
@ -171,7 +171,7 @@ void _tt_get_rpc_properties (const _tt_property_list &rpc_props,
props = new _Tt_db_property_list;
if (rpc_props.properties_len) {
for (int i=0; i < rpc_props.properties_len; i++) {
for (unsigned int i=0; i < rpc_props.properties_len; i++) {
_Tt_db_property_ptr prop;
_tt_get_rpc_property (rpc_props.properties_val [i], prop);

16
cde/lib/tt/lib/mp/mp_auth.C
View file

@ -57,7 +57,7 @@ _Tt_auth::
Tt_status _Tt_auth::
generate_auth_cookie()
{
static char *funcname = "_Tt_auth::make_auth_cookie()";
static const char *funcname = "_Tt_auth::make_auth_cookie()";
_tt_AuthFileEntry *entry;
int exists;
char *filename;
@ -79,7 +79,7 @@ generate_auth_cookie()
_TT_ICEAUTH_DEFAULT_RETRIES,
_TT_ICEAUTH_DEFAULT_TIMEOUT,
_TT_ICEAUTH_DEFAULT_DEADTIME))) {
char *reason = "unknown error";
const char *reason = "unknown error";
_tt_UnlockAuthFile(filename);
if (retval == _tt_AuthLockTimeout) {
@ -151,7 +151,7 @@ cleanup:
Tt_status _Tt_auth::
read_auth_entries(FILE *fp, _tt_AuthFileEntryList **headp)
{
static char *funcname = "_Tt_auth::read_auth_entries()";
static const char *funcname = "_Tt_auth::read_auth_entries()";
_tt_AuthFileEntry *entry;
_tt_AuthFileEntryList *head;
_tt_AuthFileEntryList *el_new;
@ -189,7 +189,7 @@ read_auth_entries(FILE *fp, _tt_AuthFileEntryList **headp)
Tt_status _Tt_auth::
read_auth_file(char *filename)
{
static char *funcname = "Tt_auth::read_auth_file()";
static const char *funcname = "Tt_auth::read_auth_file()";
FILE *authfp;
Tt_status status = TT_OK;
@ -213,7 +213,7 @@ read_auth_file(char *filename)
Tt_status _Tt_auth::
modify_auth_entry(_tt_AuthFileEntry *entry, _tt_AuthFileEntryList **headp)
{
static char *funcname = "Tt_auth::modify_auth_entry()";
static const char *funcname = "Tt_auth::modify_auth_entry()";
_tt_AuthFileEntryList *list, *prev, *el_new;
for (prev=NULL, list=*headp; list; list=list->next) {
@ -253,8 +253,8 @@ modify_auth_entry(_tt_AuthFileEntry *entry, _tt_AuthFileEntryList **headp)
Tt_status _Tt_auth::
write_auth_file(char *filename)
{
static char *funcname = "Tt_auth::write_auth_file()";
static char *suffix = "-n";
static const char *funcname = "Tt_auth::write_auth_file()";
static const char *suffix = "-n";
FILE *fp;
_tt_AuthFileEntryList *list;
char *tmpnam;
@ -300,7 +300,7 @@ retrieve_auth_cookie()
_tt_AuthFileEntry *entry = NULL;
entry = _tt_GetAuthFileEntry(_TT_ICEAUTH_PROTOCOL_NAME,
(char*) _sessionid,
_sessionid,
_TT_ICEAUTH_AUTH_NAME);
if (NULL == entry)
return TT_AUTHFILE_ENTRY_MISSING;

2
cde/lib/tt/lib/mp/mp_auth_functions.C
View file

@ -340,7 +340,7 @@ _tt_WriteAuthFileEntry(FILE *auth_file, _tt_AuthFileEntry *auth)
_tt_AuthFileEntry *
_tt_GetAuthFileEntry(char *protocol_name, char *network_id, char *auth_name)
_tt_GetAuthFileEntry(const char *protocol_name, const char *network_id, const char *auth_name)
{
FILE *auth_file;
char *filename;

6
cde/lib/tt/lib/mp/mp_auth_functions.h
View file

@ -126,9 +126,9 @@ extern int _tt_WriteAuthFileEntry (
);
extern _tt_AuthFileEntry *_tt_GetAuthFileEntry (
char * /* protocol_name */,
char * /* network_id */,
char * /* auth_name */
const char * /* protocol_name */,
const char * /* network_id */,
const char * /* auth_name */
);
extern char *_tt_GenerateMagicCookie (

1
cde/lib/tt/lib/mp/mp_c_procid.C
View file

@ -340,7 +340,6 @@ commit()
Tt_status _Tt_c_procid::
init()
{
int rpc_version = TT_RPC_VERSION;
Tt_status status;
if (_default_session.is_null()) {

1
cde/lib/tt/lib/mp/mp_c_session.C
View file

@ -79,7 +79,6 @@ c_init()
{
_Tt_string start_ttcmd;
int tried = 0;
int done = 0;
Tt_status status;
if (env() == _TT_ENV_X11) {

1
cde/lib/tt/lib/mp/mp_pattern.C
View file

@ -222,7 +222,6 @@ _Tt_pattern::add_netfile(
)
{
_Tt_string abspath;
Tt_status status = TT_OK;
int __scopes = scopes();
if ((__scopes&(1<<TT_FILE)) || (__scopes&(1<<TT_BOTH))) {

2
cde/lib/tt/lib/mp/mp_rpc_client.C
View file

@ -123,8 +123,6 @@ init(_Tt_host_ptr &host, int program, int version,
uid_t servuid, _Tt_auth &auth)
{
int optval;
static caddr_t saved_opaque = 0;
static int saved_len = 0;
optval = (_socket == RPC_ANYSOCK);
_auth = auth;

9
cde/lib/tt/lib/mp/mp_session.C
View file

@ -793,8 +793,17 @@ set_id(char *id)
if (sscanf((char *)id, "X %s %d", host, &svnum) != 2) {
return(TT_ERR_SESSION);
}
/* We _cannot_ set _displayname based solely on host and svnum,
* because :0 is NOT the same as 127.0.0.1:0 as far as X11
* is concerned: by default, it will only accept connections
* to the former. (XOpenDisplay etc. will fail if you try the below!)
sprintf(dpname, "%s:%d", host, svnum);
_displayname = dpname;
*/
if (! _displayname.len()) {
_displayname = _tt_global->xdisplayname;
}
_server_num = svnum;
_env = _TT_ENV_X11;
break;

2
cde/lib/tt/lib/tttk/ttdesktop.C
View file

@ -1659,7 +1659,9 @@ _ttdt_posix_cb(
char *categoryName, *variable, *value;
int category, i;
struct utsname names;
#if defined(OPT_SYSINFO)
char buf[ SYS_NMLN ];
#endif
case TTDT_SET_LOCALE:
return _ttDtGetLocaleCB( msg, pat, (void *)_ttDtApplyLocale, 0 );
case TTDT_GET_LOCALE:

6
cde/lib/tt/lib/tttk/tttk2free.C
View file

@ -127,7 +127,7 @@ _TttkList2Free::_TttkList2Free(
if (_items == 0) {
_max = 0;
}
for (int i = 0; i < _max; i++) {
for (unsigned int i = 0; i < _max; i++) {
_items[ i ] = new _TttkItem2Free();
if (_items[ i ] == 0) {
_destruct();
@ -188,7 +188,7 @@ _TttkList2Free::operator +=(
void
_TttkList2Free::flush()
{
for (int i = 0; i < _num; i++) {
for (unsigned int i = 0; i < _num; i++) {
_item( i ) = (caddr_t)0;
}
}
@ -200,7 +200,7 @@ _TttkList2Free::_destruct()
#ifdef OPT_VECNEW
delete [] _items;
#else
for (int i = 0; i < _max; i++) {
for (unsigned int i = 0; i < _max; i++) {
if (_items[ i ] != 0) {
delete _items[ i ];
_items[ i ] = 0;

5
cde/lib/tt/lib/util/tt_audit.C
View file

@ -63,10 +63,11 @@ void *_tt_error_pointer(Tt_status s);
// loop iteration. All this in the name of coding efficiency.
//
Tt_status _Tt_audit::
entry(char *argskey, _Tt_entry_pt func, ...)
entry(const char *argskey, _Tt_entry_pt func, ...)
{
va_list ap;
char c, *preview, *cp;
char c, *cp;
const char *preview;
int num_args = strlen(argskey);
Tt_message m;
_Tt_c_message_ptr msg;

2
cde/lib/tt/lib/util/tt_audit.h
View file

@ -40,6 +40,6 @@
class _Tt_audit: public _Tt_trace {
public:
Tt_status entry(char *argskey, _Tt_entry_pt func, ...);
Tt_status entry(const char *argskey, _Tt_entry_pt func, ...);
};
#endif /* TT_AUDIT_H */

2
cde/lib/tt/lib/util/tt_enumname.C
View file

@ -286,7 +286,7 @@ const char *
_tt_enumname(Tt_feature x) {
switch (x) {
TTC(TT_FEATURE_MULTITHREADED);
case TT_STATE_LAST:
case _TT_FEATURE_LAST:
default:
return "! Tt_feature";
}

2
cde/lib/tt/lib/util/tt_host.C
View file

@ -177,7 +177,7 @@ init_bystringaddr(_Tt_string addr)
ip_address = &ip_address_buf;
*ip_address = inet_addr((char *)addr);
if (*ip_address == -1) {
if (*ip_address == INADDR_NONE) {
return(0);
}

1
cde/lib/tt/lib/util/tt_host_equiv.C
View file

@ -307,7 +307,6 @@ _cache_it(_Tt_hostname_cache_ptr cache_ptr, _Tt_string & hostname)
_Tt_hostname_cache_ptr sh, lh;
struct hostent *host_ret;
_Xgethostbynameparams host_buf;
int failed = 0;
char **h_addr_list;

7
cde/lib/tt/lib/util/tt_trace.C
View file

@ -271,7 +271,7 @@ _Tt_trace::entry(
(*_pstream)->set_is_entered(0);
}
const char *s;
const char *s = 0;
int printmsg = 1;
//
// We do not print msg if it is a (often incomplete) update
@ -347,7 +347,7 @@ _Tt_trace::entry(
//
void
_Tt_trace::entry(
char *argskey,
const char *argskey,
_Tt_entry_pt func,
va_list ap
)
@ -373,7 +373,8 @@ _Tt_trace::entry(
(*_pstream)->set_is_entered(0);
}
char c, *preview;
char c;
const char *preview;
int num_args = strlen(argskey);
// print the API name and open paren

2
cde/lib/tt/lib/util/tt_trace.h
View file

@ -130,7 +130,7 @@ class _Tt_trace : public _Tt_allocated {
// API tracing entry call
void entry(
char *argskey,
const char *argskey,
_Tt_entry_pt func,
va_list ap
);

2
cde/lib/tt/lib/util/tt_trace_stream.C
View file

@ -138,7 +138,7 @@ operator <<(
os << _tt_enumname( msg.message_class() );
os << " <" << msg.api_id() << "> ";
os << _tt_enumname( msg.state() );
char *conjunction = " because ";
const char *conjunction = " because ";
switch (msg.state()) {
case TT_CREATED:
case TT_SENT:

2
cde/lib/tt/lib/util/tt_xdr_utils.C
View file

@ -129,7 +129,7 @@ _tt_xdr_sizeof(xdrproc_t f, void *data)
_Tt_xdr_size_stream::
_Tt_xdr_size_stream() {
memset ((char *)&ops, 0, sizeof ops);
memset (&ops, 0, sizeof ops);
#if defined(OPT_BUG_SUNOS_4) || defined(OPT_BUG_HPUX)
ops.x_putlong = (int (*)(...))tt_x_putlong;
ops.x_putbytes = (int (*)(...))tt_x_putbytes;

5
cde/programs/Imakefile
View file

@ -12,9 +12,12 @@ EXTRADIRS += util
XCOMM some of these cannot be built on linux yet.
XCOMM dtksh dtinfo
#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
DTKSHDIR =
DTINFODIR =
#elif defined(FreeBSDArchitecture)
DTKSHDIR = dtksh
DTINFODIR =
#else
DTKSHDIR = dtksh
DTINFODIR = dtinfo

2
cde/programs/dtappbuilder/src/ab/abobj_layout.c
View file

@ -110,7 +110,7 @@ abobj_calculate_new_layout(
Position x, y;
Dimension width, height;
Dimension p_width, p_height;
int gridpos;
long gridpos;
if ((attachments = obj->attachments) == NULL)
return -1;

12
cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c
View file

@ -258,7 +258,7 @@ static void set_attach_values(
PropOptionsSetting objlist_setting,
int offset_value,
int position_value,
int objlist_value
XtPointer objlist_value
);
static void change_attach_type(
@ -2642,7 +2642,7 @@ set_attach_values(
PropOptionsSetting objlist_setting,
int offset_value,
int position_value,
int objlist_value
XtPointer objlist_value
)
{
switch (attach_type)
@ -2945,7 +2945,7 @@ convert_offset_position(
/*
set_attach_values(attach_type,
offset_setting, position_setting, objlist_setting,
offset_value, position_value, (int)sibling_obj);
offset_value, position_value, (XtPointer)sibling_obj);
*/
*ret_offset = offset_value;
@ -3068,7 +3068,7 @@ change_attach_type(
*/
set_attach_values(attach_type,
offset_setting, position_setting, objlist_setting,
offset, position, (int)attach_obj);
offset, position, (XtPointer)attach_obj);
}
@ -3263,7 +3263,7 @@ change_opp_attach_type(
*/
set_attach_values(opp_attach_type,
opp_offset_setting, opp_position_setting, opp_objlist_setting,
offset, position, (int)attach_obj);
offset, position, (XtPointer)attach_obj);
}
}
@ -3335,7 +3335,7 @@ attach_obj_changed(
&offset, &position);
set_attach_values(attach_type,
offset_setting, position_setting, objlist_setting,
offset, position, (int)attach_obj);
offset, position, (XtPointer)attach_obj);
}
}

4
cde/programs/dtappbuilder/src/ab/connP.h
View file

@ -108,7 +108,7 @@ extern char ** connP_get_when_labels(
extern char ** connP_get_act_labels(
int *num_labels
);
extern int connP_get_obj_type_index(
extern long connP_get_obj_type_index(
AB_OBJECT_TYPE ab_type,
int ab_subtype
);
@ -181,7 +181,7 @@ extern int connP_objtype_needs_subtype(
AB_OBJECT_TYPE obj_type,
int obj_subtype
);
extern int connP_obj_enabled(
extern long connP_obj_enabled(
AB_OBJECT_TYPE obj_type,
int obj_subtype
);

16
cde/programs/dtappbuilder/src/ab/conn_obj.c
View file

@ -926,7 +926,7 @@ connP_make_conn_string(
)
{
register int i;
int si;
long si;
static char conn_string[BUFSIZ];
char buf[BUFSIZ];
AB_ACTION_INFO *action_info;
@ -1041,13 +1041,13 @@ connP_make_conn_string(
return(conn_string);
}
extern int
extern long
connP_get_obj_type_index(
AB_OBJECT_TYPE ab_type,
int ab_subtype
)
{
register int i;
register long i;
if (connP_objtype_needs_subtype(ab_type, ab_subtype))
{
@ -1093,8 +1093,8 @@ connP_guess_when_action(
AB_BUILTIN_ACTION *act_ret
)
{
int i = connP_get_obj_type_index(source_type, source_subtype);
int j = connP_get_obj_type_index(target_type, target_subtype);
long i = connP_get_obj_type_index(source_type, source_subtype);
long j = connP_get_obj_type_index(target_type, target_subtype);
if (ConnP_conn_objs[i].when_list != NULL)
*when_ret = ConnP_conn_objs[i].default_when;
@ -1197,7 +1197,7 @@ assign_when_list(
int source_subtype
)
{
int i;
long i;
int n;
ConnObj *src_conn_obj;
@ -1232,7 +1232,7 @@ assign_action_list(
int target_subtype
)
{
int i;
long i;
int n;
ConnObj *trg_conn_obj;
@ -1286,7 +1286,7 @@ connP_objtype_needs_subtype(
return(0);
}
extern int
extern long
connP_obj_enabled(
AB_OBJECT_TYPE obj_type,
int obj_subtype

16
cde/programs/dtappbuilder/src/ab/conn_stubs.c
View file

@ -129,7 +129,7 @@ static Widget exec_code_dialog = NULL;
static Widget exec_code_textpane = NULL;
static Widget ConnP_view_source_obj = NULL; /* View:'s "Source Object" PushButton */
static int ConnP_view_filter = -1;
static long ConnP_view_filter = -1;
static STRING CodeFragBuf = NULL;
static STRING action_type_labels[ACTION_TYPE_NUM_VALUES];
@ -496,7 +496,7 @@ populate_view_menu(
XtPointer call_data
)
{
int i;
long i;
Widget w;
@ -526,7 +526,7 @@ setup_source(
ABObj source
)
{
int i = connP_get_obj_type_index(source_type, source_subtype);
long i = connP_get_obj_type_index(source_type, source_subtype);
if (i < 0) return;
@ -544,7 +544,7 @@ setup_target(
ABObj target
)
{
int i = connP_get_obj_type_index(target_type, target_subtype);
long i = connP_get_obj_type_index(target_type, target_subtype);
if (i < 0) return;
@ -949,9 +949,9 @@ set_view_filter(
XtPointer call_data
)
{
if (ConnP_view_filter != (int)client_data)
if (ConnP_view_filter != (long)client_data)
{
ConnP_view_filter = (int)client_data;
ConnP_view_filter = (long)client_data;
populate_connection_list(NULL);
}
}
@ -1551,7 +1551,7 @@ set_standard_action_type(
)
{
XmString xm_label_str;
int i = 0;
long i = 0;
BOOL found = FALSE;
connP_set_action_type(AB_FUNC_BUILTIN);
@ -3832,7 +3832,7 @@ update_conn_ed_controls(void)
int source_subtype = -1;
AB_OBJECT_TYPE target_type = AB_TYPE_UNDEF;
int target_subtype = -1;
int i = -1, j = -1;
long i = -1, j = -1;
source_type = connP_get_source_type();
source_subtype = connP_get_source_subtype();

10
cde/programs/dtappbuilder/src/ab/message_ed_stubs.c
View file

@ -877,7 +877,7 @@ typeCB(
}
/* Set the default button to be Action1 */
if ((int)prop_options_get_value(&(mes->default_btn)) != AB_DEFAULT_BTN_ACTION1)
if ((XtPointer)prop_options_get_value(&(mes->default_btn)) != AB_DEFAULT_BTN_ACTION1)
{
prop_options_set_value(&(mes->default_btn),
(XtPointer)AB_DEFAULT_BTN_ACTION1, True);
@ -928,7 +928,7 @@ typeCB(
}
/* Set the default button to be Cancel */
if ((int)prop_options_get_value(&(mes->default_btn)) != AB_DEFAULT_BTN_CANCEL)
if ((XtPointer)prop_options_get_value(&(mes->default_btn)) != AB_DEFAULT_BTN_CANCEL)
{
prop_options_set_value(&(mes->default_btn),
(XtPointer)AB_DEFAULT_BTN_CANCEL, True);
@ -979,7 +979,7 @@ typeCB(
}
/* Set the default button to be Action2 */
if ((int)prop_options_get_value(&(mes->default_btn)) != AB_DEFAULT_BTN_ACTION2)
if ((XtPointer)prop_options_get_value(&(mes->default_btn)) != AB_DEFAULT_BTN_ACTION2)
{
prop_options_set_value(&(mes->default_btn),
(XtPointer)AB_DEFAULT_BTN_ACTION2, True);
@ -1031,7 +1031,7 @@ typeCB(
}
/* Set the default button to be Action1 */
if ((int)prop_options_get_value(&(mes->default_btn)) != AB_DEFAULT_BTN_ACTION1)
if ((XtPointer)prop_options_get_value(&(mes->default_btn)) != AB_DEFAULT_BTN_ACTION1)
{
prop_options_set_value(&(mes->default_btn),
(XtPointer)AB_DEFAULT_BTN_ACTION1, True);
@ -1079,7 +1079,7 @@ typeCB(
}
/* Set the default button to be Action1 */
if ((int)prop_options_get_value(&(mes->default_btn)) != AB_DEFAULT_BTN_ACTION1)
if ((XtPointer)prop_options_get_value(&(mes->default_btn)) != AB_DEFAULT_BTN_ACTION1)
{
prop_options_set_value(&(mes->default_btn),
(XtPointer)AB_DEFAULT_BTN_ACTION1, True);

3
cde/programs/dtappbuilder/src/abmf/abmf.c
View file

@ -174,6 +174,7 @@ nl_catd Dtb_project_catd;
/* ARGSUSED */
int
main(int argc, STRING *argv)
{
int exitValue = 0;
@ -939,7 +940,7 @@ mark_modules_to_load_and_write(
{
fileName = strlist_get_str(fileNames, i, &wasFoundVoidPtr);
assert(fileName != NULL);
wasFound = (BOOL)(unsigned)wasFoundVoidPtr;
wasFound = (BOOL)(unsigned long)wasFoundVoidPtr;
if (!wasFound)
{
util_printf_err("module not found in project: %s\n", fileName);

2
cde/programs/dtappbuilder/src/abmf/abmfP.h
View file

@ -162,7 +162,7 @@ typedef CGenAnyData CGenData;
#define mfobj_set_proj_data(_obj,_data) \
( mfobj_set_flags(_obj, CGenFlagDataIsProj), \
((int)(mfobj_data(_obj)->info.proj = (_data))) \
((long)(mfobj_data(_obj)->info.proj = (_data))) \
)
#define mfobj_get_proj_data(obj) \

2
cde/programs/dtappbuilder/src/abmf/args.c
View file

@ -1485,7 +1485,7 @@ get_wclass_and_res_value(
BOOL foundEm = FALSE;
*wClassOut = NULL;
*resValueOut = NULL;
*resValueOut = 0;
if (wClass == NULL)
{

2
cde/programs/dtappbuilder/src/abmf/connect.c
View file

@ -205,7 +205,7 @@ abmfP_get_connect_includes(StringList includeFiles, ABObj projOrModule)
assert(project != NULL);
if (project == NULL)
{
return NULL;
return 0;
}
for (trav_open(&trav, projOrModule, AB_TRAV_ACTIONS_FOR_OBJ);

2
cde/programs/dtappbuilder/src/abmf/stubs_c_file.c
View file

@ -282,7 +282,7 @@ printf_setval(GenCodeInfo genCodeInfo, ABObj obj, ...)
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
/* OSF/1 define va_list in <va_list.h> as structure of char ** and int
* Sun define va_list as void * */
va_list paramList = { NULL, 0 };
va_list paramList = { 0, 0 };
#else
va_list paramList = NULL;
#endif /* __osf__ */

4
cde/programs/dtappbuilder/src/libABil/abuil_load.c
View file

@ -605,7 +605,7 @@ widget_into_module(
/*
* Store ABObj reference in uil widget node
*/
uil_widget->header.user_data = (int)ab_widget;
uil_widget->header.user_data = (long)ab_widget;
/*
* Populate arguments and callbacks
@ -630,7 +630,7 @@ widget_into_module(
/*
* Store ABObj reference in uil widget node
*/
uil_widget->header.user_data = (int)ab_widget;
uil_widget->header.user_data = (long)ab_widget;
}

24
cde/programs/dtappbuilder/src/libABil/abuil_resource_attr_map.c
View file

@ -3355,7 +3355,7 @@ attach_context_store(
AttachmentContext *attach_context = (AttachmentContext *)context;
STRING attach_str;
AB_ATTACH_TYPE att_type;
int att_pos = 0, att_off = 0, offset = 0;
long att_pos = 0, att_off = 0, offset = 0;
void *value = NULL;
BOOL need_val = TRUE;
ObjRef *obj_ref;
@ -3480,7 +3480,7 @@ val_set_rows_proc(
XtPointer res_value
)
{
if(obj_set_num_rows(obj,(int)res_value)) return(FALSE);
if(obj_set_num_rows(obj,(long)res_value)) return(FALSE);
else return(TRUE);
}
@ -3492,7 +3492,7 @@ val_set_columns_proc(
XtPointer res_value
)
{
if(obj_set_num_columns(obj,(int)res_value)) return(FALSE);
if(obj_set_num_columns(obj,(long)res_value)) return(FALSE);
else return(TRUE);
}
@ -3504,7 +3504,7 @@ val_set_maximum_proc(
XtPointer res_value
)
{
if(obj_set_max_value(obj,(int)res_value)) return(FALSE);
if(obj_set_max_value(obj,(long)res_value)) return(FALSE);
else return(TRUE);
}
@ -3516,7 +3516,7 @@ val_set_minimum_proc(
XtPointer res_value
)
{
if(obj_set_min_value(obj,(int)res_value)) return(FALSE);
if(obj_set_min_value(obj,(long)res_value)) return(FALSE);
else return(TRUE);
}
@ -3528,7 +3528,7 @@ val_set_numcols_proc(
XtPointer res_value
)
{
if(obj_set_num_columns(obj,(int)res_value)) return(FALSE);
if(obj_set_num_columns(obj,(long)res_value)) return(FALSE);
else return(TRUE);
}
@ -3697,7 +3697,7 @@ val_set_maxlen_proc(
XtPointer res_value
)
{
if(obj_set_max_length(obj,(int)res_value)) return(FALSE);
if(obj_set_max_length(obj,(long)res_value)) return(FALSE);
else return(TRUE);
}
@ -3709,7 +3709,7 @@ val_set_panemax_proc(
XtPointer res_value
)
{
if(obj_set_pane_max(obj,(int)res_value)) return(FALSE);
if(obj_set_pane_max(obj,(long)res_value)) return(FALSE);
else return(TRUE);
}
@ -3721,7 +3721,7 @@ val_set_panemin_proc(
XtPointer res_value
)
{
if(obj_set_pane_min(obj,(int)res_value)) return(FALSE);
if(obj_set_pane_min(obj,(long)res_value)) return(FALSE);
else return(TRUE);
}
@ -3733,7 +3733,7 @@ val_set_intvalue_proc(
XtPointer res_value
)
{
if(obj_set_initial_value_int(obj,(int)res_value)) return(FALSE);
if(obj_set_initial_value_int(obj,(long)res_value)) return(FALSE);
else return(TRUE);
}
@ -3757,7 +3757,7 @@ val_set_increment_proc(
XtPointer res_value
)
{
if(obj_set_increment(obj,(int)res_value)) return(FALSE);
if(obj_set_increment(obj,(long)res_value)) return(FALSE);
else return(TRUE);
}
@ -3769,7 +3769,7 @@ val_set_decpts_proc(
XtPointer res_value
)
{
if(obj_set_decimal_points(obj,(int)res_value)) return(FALSE);
if(obj_set_decimal_points(obj,(long)res_value)) return(FALSE);
else return(TRUE);
}

2
cde/programs/dtappbuilder/src/libABil/abuil_trav.c
View file

@ -826,7 +826,7 @@ common_special_type:
get_charset_text(az_value_entry->b_charset));
else
printf(" font charset: userdefined(%x)",
get_charset_text((int) az_value_entry->az_charset_value));
get_charset_text((long) az_value_entry->az_charset_value));
goto check_for_table_value;

22
cde/programs/dtappbuilder/src/libABil/bil.c
View file

@ -1275,22 +1275,22 @@ static BOOL bil_token_table_inited = FALSE;
/*
* Compares to entries (for qsort)
*/
static int
static long
bil_token_entry_compare(const void *leftEntry, const void *rightEntry)
{
return ((int)(((BilTokenIndexEntry)leftEntry)->string))
- ((int)(((BilTokenIndexEntry)rightEntry)->string));
return ((long)(((BilTokenIndexEntry)leftEntry)->string))
- ((long)(((BilTokenIndexEntry)rightEntry)->string));
}
/*
* Compares a key to an entry (for bsearch)
*/
static int
static long
bil_token_key_compare(const void *voidIstr, const void *voidEntry)
{
return ((int)((ISTRING)(voidIstr)))
- ((int)(((BilTokenIndexEntry)voidEntry)->string));
return ((long)((ISTRING)(voidIstr)))
- ((long)(((BilTokenIndexEntry)voidEntry)->string));
}
@ -1720,9 +1720,9 @@ BIL_TOKEN
bilP_string_to_token(STRING strToken)
{
ISTRING istrToken = istr_create(strToken);
register int midDiff;
register int midIndex;
int minIndex, maxIndex;
register long midDiff;
register long midIndex;
long minIndex, maxIndex;
bil_token_table_check_init();
/*
@ -1733,8 +1733,8 @@ bilP_string_to_token(STRING strToken)
while (minIndex < maxIndex)
{
midIndex = ((minIndex + maxIndex)>>1);
midDiff = (((int)bil_token_table_index[midIndex].string)
- ((int)istrToken));
midDiff = (((long)bil_token_table_index[midIndex].string)
- ((long)istrToken));
if (midDiff < 0)
{
/* mid is too small - take upper half */

2
cde/programs/dtappbuilder/src/libABil/bil_loadatt.c
View file

@ -2417,7 +2417,7 @@ bilP_load_attachment_value(BIL_TOKEN valueToken)
{
ABObj target = NULL;
STRING name = NULL;
int value = 0;
long value = 0;
AB_COMPASS_POINT cp = AB_CP_UNDEF;
util_dprintf(3, "bilP_load_attachment_value: %d/%s\n\t%d/%s\n",

10
cde/programs/dtappbuilder/src/libABil/bil_store.c
View file

@ -2304,7 +2304,7 @@ store_attribute(
{
AB_ARG_TYPE type = AB_ARG_UNDEF;
if ((type = obj_get_arg_type(obj)) != NULL)
if ((type = obj_get_arg_type(obj)) != 0)
{
switch (type)
{
@ -2382,7 +2382,7 @@ store_attribute(
break;
case AB_ATTACH_GRIDLINE:
case AB_ATTACH_CENTER_GRIDLINE:
abio_put_integer(outFile, (int)obj_get_attach_value(obj, AB_CP_NORTH));
abio_put_integer(outFile, (long)obj_get_attach_value(obj, AB_CP_NORTH));
break;
case AB_ATTACH_POINT:
case AB_ATTACH_NONE:
@ -2415,7 +2415,7 @@ store_attribute(
break;
case AB_ATTACH_GRIDLINE:
case AB_ATTACH_CENTER_GRIDLINE:
abio_put_integer(outFile, (int)obj_get_attach_value(obj, AB_CP_SOUTH));
abio_put_integer(outFile, (long)obj_get_attach_value(obj, AB_CP_SOUTH));
break;
default:
abio_put_integer(outFile, 0);
@ -2447,7 +2447,7 @@ store_attribute(
break;
case AB_ATTACH_GRIDLINE:
case AB_ATTACH_CENTER_GRIDLINE:
abio_put_integer(outFile, (int)obj_get_attach_value(obj, AB_CP_EAST));
abio_put_integer(outFile, (long)obj_get_attach_value(obj, AB_CP_EAST));
break;
default:
abio_put_integer(outFile, 0);
@ -2479,7 +2479,7 @@ store_attribute(
break;
case AB_ATTACH_GRIDLINE:
case AB_ATTACH_CENTER_GRIDLINE:
abio_put_integer(outFile, (int)obj_get_attach_value(obj, AB_CP_WEST));
abio_put_integer(outFile, (long)obj_get_attach_value(obj, AB_CP_WEST));
break;
default:
abio_put_integer(outFile, 0);

2
cde/programs/dtappbuilder/src/libABil/gil_loadobj.c
View file

@ -116,7 +116,7 @@ gilP_load_object2(FILE * inFile, ABObj obj, ABObj parent)
attr = gilP_string_to_att(istr_string(keyword));
if ((rc = gilP_load_attribute_value(
inFile, obj, attr, parent)) != NULL)
inFile, obj, attr, parent)) != 0)
{
return_value = rc;
goto epilogue;

10
cde/programs/dtappbuilder/src/libABobj/obj_fields.c
View file

@ -2443,7 +2443,7 @@ obj_set_to(ABObj obj, ABObj to)
if (!obj_is_action(obj))
{
member_error(obj, "to");
return NULL;
return 0;
}
obj->info.action.to = to;
return 0;
@ -2468,7 +2468,7 @@ obj_set_from(ABObj obj, ABObj from)
if (!obj_is_action(obj))
{
member_error(obj, "from");
return NULL;
return 0;
}
obj->info.action.from = from;
return 0;
@ -2686,7 +2686,7 @@ obj_set_when(ABObj obj, AB_WHEN when)
if (obj->type != AB_TYPE_ACTION)
{
member_error(obj, "when");
return NULL;
return 0;
}
obj->info.action.when = when;
return 0;
@ -2978,7 +2978,7 @@ obj_get_attach_offset(
default:
if (util_get_verbosity() > 0)
fprintf(stderr, "obj_get_attach_offset: invalid direction\n");
return NULL;
return 0;
}
}
@ -3879,6 +3879,8 @@ obj_set_help_button(ABObj obj, BOOL has_button)
obj->info.message.help_button = has_button;
return 0;
}
int
obj_set_tooltalk_level(ABObj obj, AB_TOOLTALK_LEVEL tt_level)
{
verify_for_write(obj);

6
cde/programs/dtappbuilder/src/libABobj/obj_list.c
View file

@ -74,7 +74,7 @@ static int objlistP_build_user_data_array(
((((_list)->user_datas == NULL) && ((_data) != NULL))? \
objlistP_build_user_data_array(_list, _index, _data) \
: \
((int)((_list)->user_datas[(_index)] = (_data))) \
((long)((_list)->user_datas[(_index)] = (_data))) \
)
*/
@ -85,7 +85,7 @@ static int objlistP_build_user_data_array(
: \
objlistP_build_user_data_array(_list, _index, _data)) \
: \
((int)((_list)->user_datas[(_index)] = (_data))) \
((long)((_list)->user_datas[(_index)] = (_data))) \
)
#define objlistP_get_user_data(_list,_index) \
@ -260,7 +260,7 @@ objlist_add_obj(ABObjList list, ABObj obj, void *clientData)
*/
if (list->unique)
{
int index = objlist_get_obj_index(list, obj);
long index = objlist_get_obj_index(list, obj);
if (index >= 0)
{
objlistP_add_user_data(list, index, clientData);

4
cde/programs/dtappbuilder/src/libABobj/obj_names_list.c
View file

@ -176,7 +176,7 @@ objP_tree_add_to_names_list(ABObj tree)
}
if (names == NULL)
{
return NULL;
return 0;
}
for (trav_open(&trav, tree, AB_TRAV_ALL);
@ -207,7 +207,7 @@ objP_tree_remove_from_names_list(ABObj tree)
}
if (names == NULL)
{
return NULL;
return 0;
}
for (trav_open(&trav, tree, AB_TRAV_ALL);

2
cde/programs/dtappbuilder/src/libABobj/obj_scoped.c
View file

@ -115,7 +115,7 @@ obj_scoped_find_by_name(ABObj searchFirstObj, STRING objName)
moduleNameEndChar = *moduleNameEndPtr;
*moduleNameEndPtr = 0;
}
while (((*objNamePtr) != NULL) && (isspace(*objNamePtr)))
while (((*objNamePtr) != 0) && (isspace(*objNamePtr)))
{
++objNamePtr;
}

6
cde/programs/dtappbuilder/src/libABobj/obj_utils.c
View file

@ -196,7 +196,7 @@ ab_ident_is_ok(STRING ident)
{
return FALSE;
}
for (cp = ident; *cp != NULL; ++cp)
for (cp = ident; *cp != 0; ++cp)
{
if (isspace(*cp))
{
@ -789,7 +789,7 @@ obj_scoped_name_split(
moduleNameEndChar = *module_name_end_ptr;
*module_name_end_ptr = 0;
}
while (((*obj_name_ptr) != NULL) && (isspace(*obj_name_ptr)))
while (((*obj_name_ptr) != 0) && (isspace(*obj_name_ptr)))
{
++obj_name_ptr;
}
@ -1146,7 +1146,7 @@ obj_verify(ABObj obj)
obj_name, (_fieldName)))
#define check_str(obj, _field) \
( ((int)(last_field = #_field)), \
( ((long)(last_field = #_field)), \
(istr_verify(obj->_field) >= 0)? \
(0) \
: \

2
cde/programs/dtappbuilder/src/libABobjXm/objxm_args.c
View file

@ -1382,7 +1382,7 @@ objxm_dump_arglist_indented(
case AB_ARG_WIDGET:
if (cgen_args)
{
util_dprintf(0,"%s ", args[i].value != NULL?
util_dprintf(0,"%s ", args[i].value != 0?
istr_string((ISTRING)(args[i].value)) : "NULL");
}
else

12
cde/programs/dtappbuilder/src/libABobjXm/objxm_strs.c
View file

@ -68,7 +68,7 @@
*/
typedef struct
{
int rec_num; /* record # (offset) in table */
long rec_num; /* record # (offset) in table */
} TableIndexEntryRec, *TableIndexEntry, *TableIndex;
@ -519,7 +519,7 @@ objxm_get_enum_xmdef(
ISTRING strdef
)
{
unsigned char xmdef = NULL;
unsigned char xmdef = 0;
int i;
ObjxmEnumTable *enum_table = NULL;
ISTRING istr_xmname = istr_dup_existing(xmname);
@ -1052,12 +1052,12 @@ load_res_table(
}
static int
static long
xm_res_table_entry_xmname_compare(const void *leftEntry, const void *rightEntry)
{
return
((int)xm_res_table[((TableIndexEntry)leftEntry)->rec_num].xmname)
- ((int)xm_res_table[((TableIndexEntry)rightEntry)->rec_num].xmname);
((long)xm_res_table[((TableIndexEntry)leftEntry)->rec_num].xmname)
- ((long)xm_res_table[((TableIndexEntry)rightEntry)->rec_num].xmname);
}
@ -1115,7 +1115,7 @@ find_res_entry_by_xmname(ISTRING istr_xmname)
midIndex = ((minIndex + maxIndex)>>1);
entry = get_indexed_entry(
xm_res_table,xm_res_table_xmname_index,midIndex);
midDiff = ((int)(entry->xmname)) - ((int)istr_xmname);
midDiff = ((long)(entry->xmname)) - ((long)istr_xmname);
if (midDiff < 0)
{
/* mid is too small - take upper half */

8
cde/programs/dtappbuilder/src/libABobjXm/objxm_util.c
View file

@ -142,7 +142,7 @@ objxm_color_exists(
String colorname
)
{
static Colormap colormap = NULL;
static Colormap colormap = 0;
static Display *display = NULL;
XColor color;
XColor exact_color;
@ -194,7 +194,7 @@ objxm_filebase_to_pixmap(
if (util_strempty(filebase))
return ERR_BAD_PARAM2;
*pixmap_p = NULL;
*pixmap_p = 0;
/* Use Pixmap conversion callback if it exists */
if (ObjxmP_filename_to_pixmap_cb != NULL)
@ -308,7 +308,7 @@ convert_file_to_pixmap(
Pixel fgPixel = 0;
Pixel bgPixel = 0;
*pixmap_p = NULL;
*pixmap_p = 0;
/*
* Get default values
@ -329,7 +329,7 @@ convert_file_to_pixmap(
* In CDE, XmGetPixmap handles .xpm files, as well.
*/
*pixmap_p = XmGetPixmap(screen, filename, fgPixel, bgPixel);
if ((*pixmap_p == NULL) || (*pixmap_p == XmUNSPECIFIED_PIXMAP))
if ((*pixmap_p == 0) || (*pixmap_p == XmUNSPECIFIED_PIXMAP))
{
return -1;
}

44
cde/programs/dtappbuilder/src/libAButil/istr.c
View file

@ -85,7 +85,7 @@ typedef struct BUCKET
*/
STRING Istr_null_string= "(nil)";
STRN *int_array= NULL; /* unique number array */
int num_count = 1; /* unique number counter */
long num_count = 1; /* unique number counter */
static BucketRec hashtable[NUMBUCKETS];
@ -94,10 +94,10 @@ STRN *debug_istr= NULL; /* debugging shortcut for clients (see */
/* comment at top of this file) */
#endif /* DEBUG */
static int *freelist; /* freelist for unused numbers */
static long *freelist; /* freelist for unused numbers */
static int freecount = 0; /* freelist count */
static int hash_count = 0; /* total number that has been inserted */
static long freecount = 0; /* freelist count */
static long hash_count = 0; /* total number that has been inserted */
static unsigned hashing(
char *p
@ -125,7 +125,7 @@ static int istrP_errmsg_noexist(int istr_value);
#define int_array_set(ptr) (int_array = (ptr))
#endif
#define istrP_int_to_client(intVal) ((ISTRING)(intVal))
#define istrP_client_to_int(istrVal) ((int)(istrVal))
#define istrP_client_to_int(istrVal) ((long)(istrVal))
#define return_istr(x) return istrP_int_to_client(x)
/*****************************************************************************/
@ -142,7 +142,7 @@ istr_create (
)
{
int hashval;
int str_exists;
long str_exists;
Bucket new_bucket;
int i;
Bucket entry;
@ -310,7 +310,7 @@ istrP_create_alloced_impl(
)
{
int hashval;
int str_exists;
long str_exists;
Bucket new_bucket;
int i;
Bucket entry;
@ -487,7 +487,7 @@ istr_create_const(
)
{
int hashval;
int str_exists;
long str_exists;
Bucket new_bucket;
int i;
Bucket entry;
@ -668,7 +668,7 @@ istr_dup_existing(
)
{
int hashval;
int str_exists;
long str_exists;
if (string == NULL)
{
@ -696,7 +696,7 @@ istrP_destroy_impl(
ISTRING *istringClientPtr
)
{
int istring = (int)(*istringClientPtr);
long istring = (long)(*istringClientPtr);
int val; /* hashing value */
int i;
Bucket entry;
@ -712,7 +712,7 @@ istrP_destroy_impl(
(int_array[istring].read_const == 0)))
{
istrP_errmsg_noexist(istring);
return NULL;
return 0;
}
if (int_array[istring].read_const == 1) /* const entry */
{
@ -752,13 +752,13 @@ istrP_destroy_impl(
/* put unused int_array location of the freelist */
if(free_num == 0)
{
freelist = (int *)malloc(ARRAYSIZE * sizeof(int));
freelist = (long *)malloc(ARRAYSIZE * sizeof(long));
if (freelist == NULL)
{
fprintf(stderr,
catgets(UTIL_MESSAGE_CATD, UTIL_MESSAGE_SET, 3,
"ISTR: error in allocating memory\n") );
return NULL ;
return 0 ;
}
free_num = 1;
}
@ -771,15 +771,15 @@ istrP_destroy_impl(
else /* need more freelist space */
{
free_num++;
freelist = (int *)realloc(freelist,
(ARRAYSIZE * free_num) * sizeof(int));
freelist = (long *)realloc(freelist,
(ARRAYSIZE * free_num) * sizeof(long));
assert(freelist != NULL);
if (freelist == NULL)
{
fprintf(stderr,
catgets(UTIL_MESSAGE_CATD, UTIL_MESSAGE_SET, 3,
"ISTR: error in allocating memory\n") );
return NULL ;
return 0 ;
}
freelist[freecount] = istring;
freecount++;
@ -789,7 +789,7 @@ istrP_destroy_impl(
/*
* Set the client's variable to NULL
*/
istring = NULL;
istring = 0;
(*istringClientPtr) = istrP_int_to_client(istring);
return 1;
}
@ -804,7 +804,7 @@ istr_dup(
ISTRING istringClientVal
)
{
int istring= istrP_client_to_int(istringClientVal);
long istring= istrP_client_to_int(istringClientVal);
if(istring == 0)
{
@ -831,7 +831,7 @@ istrP_get_string_verify(
ISTRING istringClientVal
)
{
int istring = istrP_client_to_int(istringClientVal);
long istring = istrP_client_to_int(istringClientVal);
if(istring == 0)
{
@ -932,13 +932,13 @@ insert_array(
if(hash_count == 0)
{
int_array_set((STRN *)malloc(ARRAYSIZE * sizeof(STRN)));
int_array_set((STRN *)calloc(ARRAYSIZE, sizeof(STRN)));
if (int_array == NULL)
{
fprintf(stderr,
catgets(UTIL_MESSAGE_CATD, UTIL_MESSAGE_SET, 3,
"ISTR: error in allocating memory\n") );
return NULL ;
return 0 ;
}
array_num = 1;
}
@ -973,7 +973,7 @@ insert_array(
fprintf(stderr,
catgets(UTIL_MESSAGE_CATD, UTIL_MESSAGE_SET, 3,
"ISTR: error in allocating memory\n") );
return NULL ;
return 0 ;
}
int_array[val].refcount =1;
if (flag == 1)

4
cde/programs/dtappbuilder/src/libAButil/istr.h
View file

@ -240,7 +240,7 @@ extern ISTRING istrP_create_alloced_impl9726039350PrivF(STRING*);
extern int istrP_notify_invalid2160413670PrivF(ISTRING);
extern STRING istrP_get_string_fast3718930164PrivF(ISTRING);
extern STRING istrP_get_string_verify4521632085PrivF(ISTRING);
extern int istrP_num_count7608925912PrivD;
extern long istrP_num_count7608925912PrivD;
extern ISTR_PRIVT_STRN *istrP_int_array1809065681PrivD;
@ -272,7 +272,7 @@ extern ISTR_PRIVT_STRN *istrP_int_array1809065681PrivD;
#define istr_string_safe(s) ((s) == NULL? Istr_null_string:istr_string(s))
#define istrP_get_string_fast3718930164PrivF(istring) \
((istring)==NULL ? Istr_null_string : (istrP_int_array1809065681PrivD[((long)istring)].str))
(istrP_int_array1809065681PrivD[((long)istring)].str)
/* istr_string - if debugging is turned on, checks ISTRINGS for validity */
#ifdef DEBUG

27
cde/programs/dtappbuilder/src/libAButil/strlist.c
View file

@ -69,7 +69,7 @@ static int strlistP_build_user_data_array(
((((_list)->user_datas == NULL) && ((_data) != NULL))? \
strlistP_build_user_data_array(_list, _index, _data) \
: \
((int)((_list)->user_datas[(_index)] = (_data))) \
((long)((_list)->user_datas[(_index)] = (_data))) \
)
@ -189,10 +189,10 @@ strlist_istr_exists(StringList list, ISTRING istring)
}
int
long
strlist_set_istr_data(StringList list, ISTRING istring, void *data)
{
int index = strlist_get_istr_index(list, istring);
long index = strlist_get_istr_index(list, istring);
if (index < 0)
{
return index;
@ -215,10 +215,10 @@ strlist_get_istr_data(StringList list, ISTRING istring)
/*
* Returns the index of the given string, or -1 if it doesn't exist
*/
int
long
strlist_get_istr_index(StringList list, ISTRING string)
{
int index = -1;
long index = -1;
int i = 0;
int num_strings = list->num_strings;
@ -293,10 +293,10 @@ epilogue:
}
int
long
strlist_remove_istr(StringList list, ISTRING istring)
{
int index = strlist_get_istr_index(list, istring);
long index = strlist_get_istr_index(list, istring);
if (index < 0)
{
return 0;
@ -485,10 +485,10 @@ strlist_str_exists(StringList list, STRING string)
}
int
long
strlist_get_str_index(StringList list, STRING string)
{
int index = -1;
long index = -1;
ISTRING istring = istr_create(string);
if (istring != NULL)
{
@ -506,10 +506,10 @@ strlist_get_str(StringList list, int whichString, void **clientDataOut)
}
int
long
strlist_remove_str(StringList list, STRING string)
{
int return_value = 0;
long return_value = 0;
ISTRING istring = istr_dup_existing(string);
if (istring != NULL)
{
@ -520,10 +520,10 @@ strlist_remove_str(StringList list, STRING string)
}
int
long
strlist_set_str_data(StringList list, STRING string, void *data)
{
int return_value = 0;
long return_value = 0;
ISTRING istring = istr_dup_existing(string);
if (istring != NULL)
{
@ -571,6 +571,7 @@ strlist_dup(StringList list)
**************************************************************************/
int
strlistP_shrink_array(StringList list, int sizeDiff)
{
int return_value = 0;

14
cde/programs/dtappbuilder/src/libAButil/strlist.h
View file

@ -104,12 +104,12 @@ int strlist_dump(StringList list);
* STRING interfaces
*/
int strlist_add_str(StringList, STRING s, void *userData);
int strlist_remove_str(StringList, STRING s);
long strlist_remove_str(StringList, STRING s);
BOOL strlist_str_exists(StringList list, STRING s);
int strlist_get_str_index(StringList list, STRING s);
long strlist_get_str_index(StringList list, STRING s);
STRING strlist_get_str(StringList,
int whichString, void **userDataOut);
int strlist_set_str_data(StringList, STRING string, void *data);
long strlist_set_str_data(StringList, STRING string, void *data);
void *strlist_get_str_data(StringList, STRING string);
StringList strlist_dup(StringList);
@ -120,14 +120,14 @@ StringList strlist_dup(StringList);
* The STRINGs and ISTRING are kept in the same list, and behave identically
*/
int strlist_add_istr(StringList, ISTRING s, void *userData);
int strlist_add_index_istr(StringList,
long strlist_add_index_istr(StringList,
int index, ISTRING s, void *userData);
BOOL strlist_istr_exists(StringList list, ISTRING s);
int strlist_get_istr_index(StringList list, ISTRING s);
long strlist_get_istr_index(StringList list, ISTRING s);
ISTRING strlist_get_istr(StringList,
int whichString, void **userDataOut);
int strlist_set_istr_data(StringList, ISTRING istring, void *data);
long strlist_set_istr_data(StringList, ISTRING istring, void *data);
void *strlist_get_istr_data(StringList, ISTRING istring);
int strlist_remove_istr(StringList, ISTRING s);
long strlist_remove_istr(StringList, ISTRING s);
#endif /* _ABUTIL_STRLIST_H_ */

2
cde/programs/dthelp/parser/canon1/parser/parser.h
View file

@ -439,7 +439,7 @@ M_PAREXTERN int m_argc ;
M_PAREXTERN char **m_argv ;
/* PARSER output file */
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
M_PAREXTERN FILE *m_outfile;
M_PAREXTERN FILE *m_errfile;
#else

2
cde/programs/dthelp/parser/pass1/parser/parser.h
View file

@ -437,7 +437,7 @@ M_PAREXTERN int m_argc ;
M_PAREXTERN char **m_argv ;
/* PARSER output file */
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
M_PAREXTERN FILE *m_outfile;
M_PAREXTERN FILE *m_errfile;
#else

2
cde/programs/dthelp/parser/pass2/parser/parser.h
View file

@ -437,7 +437,7 @@ M_PAREXTERN int m_argc ;
M_PAREXTERN char **m_argv ;
/* PARSER output file */
#if defined(linux)
#if defined(linux) || defined(CSRG_BASED)
M_PAREXTERN FILE *m_outfile;
M_PAREXTERN FILE *m_errfile;
#else

Some files were not shown because too many files have changed in this diff Show more