mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-15 04:32:24 +00:00
Merge branch 'cde-fixups-1' of ssh://git.code.sf.net/p/cdesktopenv/code into cde-fixups-1
This commit is contained in:
commit
68de09848b
14 changed files with 15 additions and 15 deletions
|
@ -36,7 +36,7 @@ http://sourceforge.net/p/cdesktopenv/wiki/Home/
|
||||||
|
|
||||||
Please go there and read the appropriate section(s) for your OS (Linux
|
Please go there and read the appropriate section(s) for your OS (Linux
|
||||||
or FreeBSD/OpenBSD/NetBSD currently). There are a variety of
|
or FreeBSD/OpenBSD/NetBSD currently). There are a variety of
|
||||||
dependancies that must be met, as well as specific set up steps
|
dependencies that must be met, as well as specific set up steps
|
||||||
required to build.
|
required to build.
|
||||||
|
|
||||||
Do not expect to just type 'make' and have it actually work without
|
Do not expect to just type 'make' and have it actually work without
|
||||||
|
|
|
@ -222,7 +222,7 @@ must be an uppercase ASCII alphabetic character.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
<varlistentry><term>delimiter = <emphasis>line_identifer</emphasis>, bottom</term>
|
<varlistentry><term>delimiter = <emphasis>line_identifier</emphasis>, bottom</term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Defines the end of text (ETX) delimiter that will separate records.
|
<para>Defines the end of text (ETX) delimiter that will separate records.
|
||||||
</para>
|
</para>
|
||||||
|
|
|
@ -333,7 +333,7 @@ ExpandVariables(
|
||||||
/* Process an "output" translation spec - one of StartText, EndText,
|
/* Process an "output" translation spec - one of StartText, EndText,
|
||||||
* Replace, Message. (These are the ones that produce output.)
|
* Replace, Message. (These are the ones that produce output.)
|
||||||
* Steps done:
|
* Steps done:
|
||||||
* Expand attributes and regular varaibles in input string.
|
* Expand attributes and regular variables in input string.
|
||||||
* Pass thru string, accumulating chars to be sent to output stream.
|
* Pass thru string, accumulating chars to be sent to output stream.
|
||||||
* If we find the start of a special variable, output what we've
|
* If we find the start of a special variable, output what we've
|
||||||
* accumulated, then find the special variable's "bounds" (ie, the
|
* accumulated, then find the special variable's "bounds" (ie, the
|
||||||
|
|
|
@ -231,7 +231,7 @@ _DtHelpFileTraceLinks (
|
||||||
|
|
||||||
/* get last slash in the current file path */
|
/* get last slash in the current file path */
|
||||||
if(_DtHelpCeStrrchr(filePath,DirSlashStr,MB_CUR_MAX,&slash) == 0)
|
if(_DtHelpCeStrrchr(filePath,DirSlashStr,MB_CUR_MAX,&slash) == 0)
|
||||||
{ /* there is a path comonent in filePath; use it with linkPath */
|
{ /* there is a path component in filePath; use it with linkPath */
|
||||||
strcpy(++slash,linkPath);
|
strcpy(++slash,linkPath);
|
||||||
strcpy(linkPath,filePath); /* leave result in linkPath */
|
strcpy(linkPath,filePath); /* leave result in linkPath */
|
||||||
}
|
}
|
||||||
|
|
|
@ -190,7 +190,7 @@ $ Msg 46 should not translate "delblanklines."
|
||||||
53 "Error - delimiter defined as '%1$s' references a physical line in the record.\n\
|
53 "Error - delimiter defined as '%1$s' references a physical line in the record.\n\
|
||||||
Since the delimiter defines the physical lines\n\
|
Since the delimiter defines the physical lines\n\
|
||||||
it cannot be referenced as a physical line.\n"
|
it cannot be referenced as a physical line.\n"
|
||||||
54 "Error - for field '%1$s', no line identifer matches '%2$s'.\n"
|
54 "Error - for field '%1$s', no line identifier matches '%2$s'.\n"
|
||||||
55 "Error - field include/exclude list included\n\
|
55 "Error - field include/exclude list included\n\
|
||||||
the field '%1$s', which was never defined.\n"
|
the field '%1$s', which was never defined.\n"
|
||||||
56 "Error - image include/exclude list included\n\
|
56 "Error - image include/exclude list included\n\
|
||||||
|
|
|
@ -745,7 +745,7 @@ static int add_a_keytype (char ktchar)
|
||||||
* For example if how_many == 1, only 1 keytype will be added
|
* For example if how_many == 1, only 1 keytype will be added
|
||||||
* and the balance of the line will be ignored.
|
* and the balance of the line will be ignored.
|
||||||
* We also quit adding keytypes when the total reaches
|
* We also quit adding keytypes when the total reaches
|
||||||
* MAX_KTCOUNT or when we hit end of line or commments.
|
* MAX_KTCOUNT or when we hit end of line or comments.
|
||||||
*/
|
*/
|
||||||
static void read_keytypes (int how_many, _Xstrtokparams *strtok_buf)
|
static void read_keytypes (int how_many, _Xstrtokparams *strtok_buf)
|
||||||
{
|
{
|
||||||
|
|
|
@ -144,7 +144,7 @@ refer to the _DtXlatedocumentation.
|
||||||
<operations> : a CDE-standardized identifier for the operation(s) to
|
<operations> : a CDE-standardized identifier for the operation(s) to
|
||||||
which the value applies. The operation(s) need not be supported by every
|
which the value applies. The operation(s) need not be supported by every
|
||||||
platform, but CDE must have standardized an identifier for the operation
|
platform, but CDE must have standardized an identifier for the operation
|
||||||
in order for it to be used. More than one identifer may be included by
|
in order for it to be used. More than one identifier may be included by
|
||||||
concatenating them using the ',' separator, eg. "iconv1,iconv3".
|
concatenating them using the ',' separator, eg. "iconv1,iconv3".
|
||||||
|
|
||||||
_DtLcx defines a number of standard operation strings that use
|
_DtLcx defines a number of standard operation strings that use
|
||||||
|
|
|
@ -2437,7 +2437,7 @@ will be necessary to ensure correct translation specifications.
|
||||||
<operations> : a CDE-standardized identifier for the operation(s) to
|
<operations> : a CDE-standardized identifier for the operation(s) to
|
||||||
which the value applies. The operation(s) need not be supported by every
|
which the value applies. The operation(s) need not be supported by every
|
||||||
platform, but CDE must have standardized an identifier for the operation
|
platform, but CDE must have standardized an identifier for the operation
|
||||||
in order for it to be used. More than one identifer may be included by
|
in order for it to be used. More than one identifier may be included by
|
||||||
concatenating them using the ',' separator, eg. "iconv1,iconv3".
|
concatenating them using the ',' separator, eg. "iconv1,iconv3".
|
||||||
|
|
||||||
<transtype> : The <transtype> field records the direction of
|
<transtype> : The <transtype> field records the direction of
|
||||||
|
|
|
@ -199,7 +199,7 @@ inherit : FROM otid
|
||||||
*
|
*
|
||||||
* args ::= '(' argspec {, argspec}* ')' | '(void)' | '()'
|
* args ::= '(' argspec {, argspec}* ')' | '(void)' | '()'
|
||||||
*
|
*
|
||||||
* cxtdcl ::= 'context' '(' identifier {, identifer }* ')'
|
* cxtdcl ::= 'context' '(' identifier {, identifier }* ')'
|
||||||
*
|
*
|
||||||
* argspec ::= mode type name
|
* argspec ::= mode type name
|
||||||
*
|
*
|
||||||
|
|
|
@ -329,7 +329,7 @@ CallInterpreter(
|
||||||
* Replace, Message (these are the ones that produce output), or
|
* Replace, Message (these are the ones that produce output), or
|
||||||
* StartCode and EndCode (these get passed to the interpreter).
|
* StartCode and EndCode (these get passed to the interpreter).
|
||||||
* Steps done:
|
* Steps done:
|
||||||
* Expand attributes and regular varaibles in input string.
|
* Expand attributes and regular variables in input string.
|
||||||
* Pass thru string, accumulating chars to be sent to output stream.
|
* Pass thru string, accumulating chars to be sent to output stream.
|
||||||
* If we find the start of a special variable, output what we've
|
* If we find the start of a special variable, output what we've
|
||||||
* accumulated, then find the special variable's "bounds" (ie, the
|
* accumulated, then find the special variable's "bounds" (ie, the
|
||||||
|
|
|
@ -287,7 +287,7 @@ LinkTraceProc(clientData, interp, name1, name2, flags)
|
||||||
/*
|
/*
|
||||||
* For writes, first make sure that the variable is writable. Then
|
* For writes, first make sure that the variable is writable. Then
|
||||||
* convert the Tcl value to C if possible. If the variable isn't
|
* convert the Tcl value to C if possible. If the variable isn't
|
||||||
* writable or can't be converted, then restore the varaible's old
|
* writable or can't be converted, then restore the variable's old
|
||||||
* value and return an error. Another tricky thing: we have to save
|
* value and return an error. Another tricky thing: we have to save
|
||||||
* and restore the interpreter's result, since the variable access
|
* and restore the interpreter's result, since the variable access
|
||||||
* could occur when the result has been partially set.
|
* could occur when the result has been partially set.
|
||||||
|
|
|
@ -1417,7 +1417,7 @@ BAD_ABSTR:
|
||||||
}
|
}
|
||||||
if (!found && !field_current->constant) {
|
if (!found && !field_current->constant) {
|
||||||
printf ( catgets(dtsearch_catd, MS_chandel, 54,
|
printf ( catgets(dtsearch_catd, MS_chandel, 54,
|
||||||
"Error - for field '%s', no line identifer matches '%s'.\n") ,
|
"Error - for field '%s', no line identifier matches '%s'.\n") ,
|
||||||
field_current->name, field_current->line_id);
|
field_current->name, field_current->line_id);
|
||||||
bad_profile = TRUE;
|
bad_profile = TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -348,7 +348,7 @@ Warning (char *message)
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* -----------
|
* -----------
|
||||||
* This function lists several messages to stderr using fprinf()
|
* This function lists several messages to stderr using fprintf()
|
||||||
* formatting capabilities.
|
* formatting capabilities.
|
||||||
*
|
*
|
||||||
* Inputs:
|
* Inputs:
|
||||||
|
|
|
@ -645,7 +645,7 @@ MessageFragment::appModule,
|
||||||
51
|
51
|
||||||
#ifndef SP_NO_MESSAGE_TEXT
|
#ifndef SP_NO_MESSAGE_TEXT
|
||||||
,"invalid comment declaration: found %1 outside comment but inside comment declaration"
|
,"invalid comment declaration: found %1 outside comment but inside comment declaration"
|
||||||
,"commment declaration started here"
|
,"comment declaration started here"
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
const MessageType1 ParserMessages::instanceDeclaration(
|
const MessageType1 ParserMessages::instanceDeclaration(
|
||||||
|
@ -1922,7 +1922,7 @@ MessageFragment::appModule,
|
||||||
#endif
|
#endif
|
||||||
163
|
163
|
||||||
#ifndef SP_NO_MESSAGE_TEXT
|
#ifndef SP_NO_MESSAGE_TEXT
|
||||||
,"invalid formal public identifer %1: public text display version not permitted with this text class"
|
,"invalid formal public identifier %1: public text display version not permitted with this text class"
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
const MessageType1 ParserMessages::fpiExtraField(
|
const MessageType1 ParserMessages::fpiExtraField(
|
||||||
|
|
Loading…
Reference in a new issue