Menu
▾
▴
[Oorexx-svn] SF.net SVN: oorexx: [1119] sandbox/rick/warnings2
|
From: <bi...@us...> - 2007-10-28 21:20:14
|
Revision: 1119
http://oorexx.svn.sourceforge.net/oorexx/?rev=1119&view=rev
Author: bigrixx
Date: 2007-10-28 14:20:18 -0700 (Sun, 28 Oct 2007)
Log Message:
-----------
Merge Mark M's OS/2 type changes.
Modified Paths:
--------------
sandbox/rick/warnings2/kernel/SOM/SOMObjectNative.cpp
sandbox/rick/warnings2/kernel/SOM/SOMUtilities.cpp
sandbox/rick/warnings2/kernel/classes/ASCIIDBCSStrings.cpp
sandbox/rick/warnings2/kernel/classes/MethodClass.cpp
sandbox/rick/warnings2/kernel/classes/MethodClass.hpp
sandbox/rick/warnings2/kernel/classes/NumberStringMath2.cpp
sandbox/rick/warnings2/kernel/classes/StackClass.hpp
sandbox/rick/warnings2/kernel/classes/StringClass.cpp
sandbox/rick/warnings2/kernel/classes/StringClassConversion.cpp
sandbox/rick/warnings2/kernel/classes/StringClassMisc.cpp
sandbox/rick/warnings2/kernel/expression/BuiltinFunctions.cpp
sandbox/rick/warnings2/kernel/expression/ExpressionFunction.cpp
sandbox/rick/warnings2/kernel/expression/ExpressionStack.cpp
sandbox/rick/warnings2/kernel/expression/ExpressionStack.hpp
sandbox/rick/warnings2/kernel/instructions/CallInstruction.cpp
sandbox/rick/warnings2/kernel/instructions/CallInstruction.hpp
sandbox/rick/warnings2/kernel/instructions/EndInstruction.hpp
sandbox/rick/warnings2/kernel/instructions/NumericInstruction.cpp
sandbox/rick/warnings2/kernel/instructions/NumericInstruction.hpp
sandbox/rick/warnings2/kernel/instructions/ParseInstruction.cpp
sandbox/rick/warnings2/kernel/instructions/ParseInstruction.hpp
sandbox/rick/warnings2/kernel/instructions/RexxInstruction.cpp
sandbox/rick/warnings2/kernel/instructions/RexxInstruction.hpp
sandbox/rick/warnings2/kernel/instructions/SignalInstruction.cpp
sandbox/rick/warnings2/kernel/instructions/SignalInstruction.hpp
sandbox/rick/warnings2/kernel/instructions/TraceInstruction.cpp
sandbox/rick/warnings2/kernel/instructions/TraceInstruction.hpp
sandbox/rick/warnings2/kernel/messages/gencat.inp
sandbox/rick/warnings2/kernel/parser/InstructionParser.cpp
sandbox/rick/warnings2/kernel/parser/Scanner.cpp
sandbox/rick/warnings2/kernel/parser/SourceFile.hpp
sandbox/rick/warnings2/kernel/platform/unix/APIDefinitions.h
sandbox/rick/warnings2/kernel/platform/unix/DBCSSupport.cpp
sandbox/rick/warnings2/kernel/platform/unix/ErrorMessages.cpp
sandbox/rick/warnings2/kernel/platform/unix/ExternalFunctions.cpp
sandbox/rick/warnings2/kernel/platform/unix/FileSystem.cpp
sandbox/rick/warnings2/kernel/platform/unix/MiscSystem.cpp
sandbox/rick/warnings2/kernel/platform/unix/PlatformDefinitions.h
sandbox/rick/warnings2/kernel/platform/unix/RexxMain.cpp
sandbox/rick/warnings2/kernel/platform/unix/RexxQueues.cpp
sandbox/rick/warnings2/kernel/platform/unix/StoredMetaData.cpp
sandbox/rick/warnings2/kernel/platform/unix/SystemCommands.cpp
sandbox/rick/warnings2/kernel/platform/unix/ThreadSupport.cpp
sandbox/rick/warnings2/kernel/platform/unix/ValueFunction.cpp
sandbox/rick/warnings2/kernel/platform/unix/VariablePool.cpp
sandbox/rick/warnings2/kernel/platform/windows/DBCSSupport.cpp
sandbox/rick/warnings2/kernel/platform/windows/DebugOutput.cpp
sandbox/rick/warnings2/kernel/platform/windows/DebugOutput.h
sandbox/rick/warnings2/kernel/platform/windows/ErrorMessages.cpp
sandbox/rick/warnings2/kernel/platform/windows/ExternalFunctions.cpp
sandbox/rick/warnings2/kernel/platform/windows/FileSystem.cpp
sandbox/rick/warnings2/kernel/platform/windows/MiscSystem.cpp
sandbox/rick/warnings2/kernel/platform/windows/PlatformDefinitions.h
sandbox/rick/warnings2/kernel/platform/windows/RexxCompiler.cpp
sandbox/rick/warnings2/kernel/platform/windows/RexxMain.cpp
sandbox/rick/warnings2/kernel/platform/windows/RexxQueues.cpp
sandbox/rick/warnings2/kernel/platform/windows/StoredMetaData.cpp
sandbox/rick/warnings2/kernel/platform/windows/SystemCommands.cpp
sandbox/rick/warnings2/kernel/platform/windows/ValueFunction.cpp
sandbox/rick/warnings2/kernel/platform/windows/VariablePool.cpp
sandbox/rick/warnings2/kernel/runtime/GlobalData.cpp
sandbox/rick/warnings2/kernel/runtime/RexxActivation.cpp
sandbox/rick/warnings2/kernel/runtime/RexxActivity.cpp
sandbox/rick/warnings2/kernel/runtime/RexxActivity.hpp
sandbox/rick/warnings2/kernel/runtime/RexxBuffer.cpp
sandbox/rick/warnings2/kernel/runtime/RexxBuiltinFunctions.h
sandbox/rick/warnings2/kernel/runtime/RexxCompoundTail.cpp
sandbox/rick/warnings2/kernel/runtime/RexxCore.h
sandbox/rick/warnings2/kernel/runtime/RexxEnvelope.cpp
sandbox/rick/warnings2/kernel/runtime/RexxHashTable.cpp
sandbox/rick/warnings2/kernel/runtime/RexxListTable.cpp
sandbox/rick/warnings2/kernel/runtime/RexxNativeAPI.h
sandbox/rick/warnings2/kernel/runtime/RexxNativeActivation.cpp
sandbox/rick/warnings2/kernel/runtime/RexxNativeActivation.hpp
sandbox/rick/warnings2/kernel/runtime/RexxSmartBuffer.cpp
sandbox/rick/warnings2/kernel/runtime/Version.cpp
sandbox/rick/warnings2/kernel/streamLibrary/StreamNative.cpp
sandbox/rick/warnings2/lib/RexxPlatformInterface.h
sandbox/rick/warnings2/platform/unix/RexxCompiler.cpp
sandbox/rick/warnings2/platform/unix/rexx.cpp
sandbox/rick/warnings2/rexxapi/APIUtil.h
sandbox/rick/warnings2/rexxapi/unix/MacroSpace.cpp
sandbox/rick/warnings2/rexxapi/unix/QueueCommand.cpp
sandbox/rick/warnings2/rexxapi/unix/QueuesAPI.cpp
sandbox/rick/warnings2/rexxapi/unix/RexxAPIManager.cpp
sandbox/rick/warnings2/rexxapi/unix/RexxAPIManager.h
sandbox/rick/warnings2/rexxapi/unix/SUBCOMCommand.cpp
sandbox/rick/warnings2/rexxapi/unix/SubcommandAPI.cpp
sandbox/rick/warnings2/rexxapi/unix/rexx.h
sandbox/rick/warnings2/rexxapi/windows/APIUtilities.c
sandbox/rick/warnings2/rexxapi/windows/MacroSpace.c
sandbox/rick/warnings2/rexxapi/windows/SUBCOMCommand.c
sandbox/rick/warnings2/rexxapi/windows/rexx.h
sandbox/rick/warnings2/samples/unix/api/callrexx/callrexx2.c
Modified: sandbox/rick/warnings2/kernel/SOM/SOMObjectNative.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/SOM/SOMObjectNative.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/SOM/SOMObjectNative.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -141,7 +141,7 @@
case tk_boolean: /* BOOLEAN */
*cp++ = 'b';
break;
- case tk_char: /* CHAR */
+ case tk_char: /* char */
*cp++ = 'c';
break;
case tk_octet: /* BYTE */
@@ -476,8 +476,8 @@
LONG REXXENTRY RexxCallProgram (
- PCHAR name, /* program name */
- PCHAR interface, /* interface definition string */
+ char *name, /* program name */
+ char *interface, /* interface definition string */
PVOID result, /* returned argument */
... ) /* variable number of arguments */
/******************************************************************************/
@@ -486,7 +486,7 @@
{
va_list arguments; /* variable argument list */
LONG rc; /* REXX return code */
- CHAR temp_interface[10]; /* temporary interface list */
+ char temp_interface[10]; /* temporary interface list */
va_start(arguments, result); /* get the start of the valist */
@@ -502,8 +502,8 @@
}
LONG REXXENTRY RexxCallString (
- PCHAR program, /* program string */
- PCHAR interface, /* interface definition string */
+ char *program, /* program string */
+ char *interface, /* interface definition string */
PVOID result, /* returned argument */
... ) /* variable number of arguments */
/******************************************************************************/
@@ -512,7 +512,7 @@
{
va_list arguments; /* variable argument list */
LONG rc; /* REXX return code */
- CHAR temp_interface[10]; /* temporary interface list */
+ char temp_interface[10]; /* temporary interface list */
va_start(arguments, result); /* get the start of the valist */
Modified: sandbox/rick/warnings2/kernel/SOM/SOMUtilities.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/SOM/SOMUtilities.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/SOM/SOMUtilities.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -68,7 +68,7 @@
void bad_argtype(
LONG argument_position, /* argument position location */
- PCHAR argument_name ) /* ascii-z argument name */
+ char *argument_name ) /* ascii-z argument name */
/******************************************************************************/
/* Function: raise a bad argument error */
/******************************************************************************/
@@ -78,7 +78,7 @@
void unsupported_type(
LONG argument_position, /* argument position location */
- PCHAR argument_name ) /* ascii-z argument name */
+ char *argument_name ) /* ascii-z argument name */
/******************************************************************************/
/* Function: raise an unsupported type message */
/******************************************************************************/
@@ -358,7 +358,7 @@
extern "C" {
BOOL convertInputString(
RexxObject *argument, /* argument to convert */
- PCHAR *outputArgument, /* converted argument */
+ char **outputArgument, /* converted argument */
RexxTable *saveTable,
Environment *ev ); /* pointer to the environment */
@@ -744,7 +744,7 @@
BOOL convertInputChar(
RexxObject *argument, /* argument to convert */
- CHAR *outputArgument ) /* converted argument */
+ char *outputArgument ) /* converted argument */
/******************************************************************************/
/* Function: Convert a character input argument type */
/******************************************************************************/
@@ -758,7 +758,7 @@
/* if resulting string length is one */
if (tempString->length == 1) {
/* yes, return the converted arg */
- *outputArgument = (CHAR)*tempString->stringData;
+ *outputArgument = (char)*tempString->stringData;
return TRUE; /* got a good conversion */
}
return FALSE; /* bad conversion */
@@ -976,10 +976,10 @@
pointerType = *(TypeCode *)parm._value;
/* Get TCKind value */
kind = TypeCode_kind(pointerType, ev);
- /* looking for char * or UCHAR * */
+ /* looking for char * or unsigned char */
if (tk_char == kind || tk_octet == kind ) {
/* Yes, treat as a string. */
- return convertInputString(argument, (PCHAR *)outputArgument, saveTable, ev);
+ return convertInputString(argument, (char **)outputArgument, saveTable, ev);
}
/* convert OREXX object to pointer */
/* and add it to the SOM ArgLIst */
@@ -1029,7 +1029,7 @@
BOOL convertInputString(
RexxObject *argument, /* argument to convert */
- PCHAR *outputArgument, /* converted argument */
+ char **outputArgument, /* converted argument */
RexxTable *saveTable,
Environment *ev ) /* pointer to the environment */
/******************************************************************************/
@@ -1046,7 +1046,7 @@
else if ((dlfObject = getDLFBasicTypeObj(argument)) && dlfObject->somIsA(_DLFString))
/* Yes, get address, for string */
/* Allows updating of String directl*/
- *outputArgument = (PCHAR)*(((DLFString *)dlfObject)->_get_address(ev));
+ *outputArgument = (char *)*(((DLFString *)dlfObject)->_get_address(ev));
else { /* get the argument string value */
RexxString *tempString = argument->stringValue();
saveTable->put(tempString, tempString);
@@ -1283,7 +1283,7 @@
case tk_string:
/* do the conversion */
- convertInputString(thisObject, (PCHAR *)bufferPtr, saveTable, ev);
+ convertInputString(thisObject, (char **)bufferPtr, saveTable, ev);
break;
/* Arrays are currently not */
@@ -1467,7 +1467,7 @@
case tk_string:
/* do the conversion */
- convertInputString(thisObject, (PCHAR *)bufferPtr, saveTable, ev);
+ convertInputString(thisObject, (char **)bufferPtr, saveTable, ev);
break;
/* Arrays are currently not */
@@ -1775,9 +1775,9 @@
case tk_string:
/* do the conversion */
- convertInputString(thisObject, (PCHAR *)&tempAddr, saveTable, &ev);
+ convertInputString(thisObject, (char **)&tempAddr, saveTable, &ev);
/* add to the argument list */
- somargs->addString(&ev, (PCHAR)tempAddr);
+ somargs->addString(&ev, (char *)tempAddr);
break;
case tk_array:
@@ -2274,7 +2274,7 @@
case tk_string:
/* do the conversion */
- convertInputString(thisObject, (PCHAR *)&tempAddr, saveTable, &ev);
+ convertInputString(thisObject, (char **)&tempAddr, saveTable, &ev);
/* add to the argument list */
argList->set_item(&ev, argNum, argName, tc, &tempAddr, argLength, flags);
break;
Modified: sandbox/rick/warnings2/kernel/classes/ASCIIDBCSStrings.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/classes/ASCIIDBCSStrings.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/classes/ASCIIDBCSStrings.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -101,15 +101,15 @@
return rc; /* return compare result */
}
-UCHAR DBCS_Type(
+char DBCS_Type(
RexxString *String ) /* Input String */
/*********************************************************************/
/* Function: Do DBCS string type validation */
/*********************************************************************/
{
- const char *CStr; /* current scan location */
- const char *EndStr; /* end location */
- CHAR rc; /* Function return code. */
+ const char *CStr; /* current scan location */
+ const char *EndStr; /* end location */
+ char rc; /* Function return code. */
BOOL ChkFlag; /* Invalid string flag. */
size_t StrLen; /* Input String length. */
size_t DBCSNum; /* Number of DBCS bytes. */
@@ -156,8 +156,8 @@
const char *String; /* string scan pointer */
size_t Length; /* byte length of the string */
size_t CharLength; /* Input HugeString length. */
- CHAR BadChar[4]; /* working buffer for errors */
- CHAR HexBadChar[4]; /* working buffer for errors */
+ char BadChar[4]; /* working buffer for errors */
+ char HexBadChar[4]; /* working buffer for errors */
BOOL HasDBCS; /* found a DBCS character */
if (NoDBCS(this)) /* already validated? */
@@ -1191,7 +1191,7 @@
char *outspot; /* output spot */
union convert { /* Use to get DBCS bytes */
USHORT convchar; /* From USHORT DBCS code. */
- UCHAR conv[2]; /* DBCS 1ST and 2ND byte. */
+ unsigned char conv[2]; /* DBCS 1ST and 2ND byte. */
}
convert;
size_t TableNum; /* current country table */
@@ -1261,7 +1261,7 @@
size_t i; /* Use for index of table. */
union convert { /* Use to get DBCS bytes */
USHORT convchar; /* From unsigned int DBCS */
- UCHAR conv[2]; /* DBCS 1ST and 2ND byte. */
+ unsigned char conv[2]; /* DBCS 1ST and 2ND byte. */
}
convert;
size_t TableNum;
@@ -1403,10 +1403,10 @@
const char * DBCS_strrchr(
const char *String, /* searched string */
- size_t Length, /* string length */
- UCHAR ch ) /* searched character */
+ size_t Length, /* string length */
+ unsigned char ch ) /* searched character */
{
- const char * Match; /* match location */
+ const char * Match; /* match location */
Match = NULL; /* no match yet */
@@ -2020,7 +2020,7 @@
RexxInteger *RexxString::DBCSdatatype(INT DataType )
{
RexxInteger *Retval; /* Return DataValue. */
- UCHAR MixedType; /* HugeString attributes. */
+ unsigned char MixedType; /* HugeString attributes. */
MixedType = DBCS_Type(this); /* get type of string */
@@ -3005,7 +3005,7 @@
if (tablei == OREF_NULL) { /* Omitted input table? */
/* SBCS, use ASCII char code */
if (OldCharLen == SBCS_BYTELEN) {
- BPos = (UCHAR)*InputStr; /* InTable is character code */
+ BPos = (unsigned char)*InputStr; /* InTable is character code */
BPos++; /* make origin 1 */
}
else
@@ -3072,7 +3072,7 @@
size_t ReqBytes; /* requested bytes */
const char * String; /* input string pointer */
size_t Length; /* string length */
- UCHAR Option; /* specified option */
+ unsigned char Option; /* specified option */
size_t RemBytes; /* remainder bytes */
RexxString *Retval; /* function return value */
@@ -3153,7 +3153,7 @@
size_t PadSize; /* size of pad character */
const char * String; /* input string pointer */
size_t Length; /* string length */
- UCHAR Option; /* specified option */
+ unsigned char Option; /* specified option */
size_t RemBytes; /* remainder bytes */
RexxString *Retval; /* function return value */
@@ -3248,7 +3248,7 @@
char * CStr; /* string pointer */
const char * SBCSPad; /* SBCSPad character */
const char * DBCSPad = NULL; /* DBCSPad character */
- UCHAR Option; /* SO/SI counting option */
+ unsigned char Option; /* SO/SI counting option */
size_t ReqBytes; /* requested bytes */
ValidDBCS(this); /* validate the string */
@@ -3365,7 +3365,7 @@
size_t Length; /* length of input string */
const char * String; /* pointer to string */
RexxString *Retval; /* result copy pointer */
- UCHAR Option; /* SO/SI counting option */
+ unsigned char Option; /* SO/SI counting option */
size_t ReqBytes; /* requested bytes */
ValidDBCS(this); /* validate the string */
@@ -3400,7 +3400,7 @@
size_t Length; /* length of input string */
const char * String; /* pointer to string */
RexxString *Retval; /* result copy pointer */
- UCHAR Option; /* SO/SI counting option */
+ unsigned char Option; /* SO/SI counting option */
size_t ReqBytes; /* requested bytes */
size_t RemBytes; /* remainder bytes */
@@ -3521,7 +3521,7 @@
RexxInteger *RexxString::dbValidate(RexxString *option)
{
RexxInteger *Retval; /* return value */
- UCHAR Option; /* SO/SI counting option */
+ unsigned char Option; /* SO/SI counting option */
/* get the option character */
Option = option_character(option, DBCS_COUNT, ARG_ONE);
@@ -3540,7 +3540,7 @@
RexxInteger *RexxString::dbWidth(RexxString *option)
{
- UCHAR Option; /* function option */
+ unsigned char Option; /* function option */
size_t slength;
ValidDBCS(this); /* validate the string */
@@ -3559,7 +3559,7 @@
RexxString *RexxString::dbAdjust(RexxString *option)
{
- UCHAR Option; /* function option character */
+ unsigned char Option; /* function option character */
ValidDBCS(this); /* validate the string */
/* get the option character */
Modified: sandbox/rick/warnings2/kernel/classes/MethodClass.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/classes/MethodClass.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/classes/MethodClass.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -797,7 +797,7 @@
RexxMethod *RexxMethodClass::restore(
RexxBuffer *buffer, /* buffer containing the method */
- PCHAR startPointer) /* first character of the method */
+ char *startPointer) /* first character of the method */
/******************************************************************************/
/* Function: Unflatten a translated method. Passed a buffer object containing*/
/* the method */
Modified: sandbox/rick/warnings2/kernel/classes/MethodClass.hpp
===================================================================
--- sandbox/rick/warnings2/kernel/classes/MethodClass.hpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/classes/MethodClass.hpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -87,9 +87,9 @@
inline size_t methnum() {return this->methodInfo.methnum; };
inline size_t arguments() {return this->methodInfo.arguments; };
inline size_t flags() {return this->methodInfo.flags; };
- inline void setMethnum(USHORT num) { this->methodInfo.methnum = num; };
- inline void setFlags(UCHAR newFlags) { this->methodInfo.flags = newFlags; };
- inline void setArguments(UCHAR args) { this->methodInfo.arguments = args; };
+ inline void setMethnum(size_t num) { this->methodInfo.methnum = num; };
+ inline void setFlags(size_t newFlags) { this->methodInfo.flags = newFlags; };
+ inline void setArguments(size_t args) { this->methodInfo.arguments = args; };
inline bool isGuarded() {return (this->methodInfo.flags & UNGUARDED_FLAG) == 0; };
inline bool isInternal() {return (this->methodInfo.flags & INTERNAL_FLAG) != 0; };
@@ -141,7 +141,7 @@
RexxMethod *newEntry(PFN);
RexxMethod *newSom(RexxClass *);
RexxArray *newArrayOfSOMMethods(RexxClass *, long);
- RexxMethod *restore(RexxBuffer *, PCHAR);
+ RexxMethod *restore(RexxBuffer *, char *);
RexxMethod *newFile(RexxString *);
RexxMethod *newFileRexx(RexxString *);
};
Modified: sandbox/rick/warnings2/kernel/classes/NumberStringMath2.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/classes/NumberStringMath2.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/classes/NumberStringMath2.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -270,9 +270,9 @@
RexxNumberStringBase *SaveLeft; /* dummy operator object */
RexxNumberStringBase *SaveRight; /* dummy operator object */
/* buffers for dummy arguments */
- CHAR AccumBuffer[sizeof(RexxNumberStringBase)];
- CHAR SaveLeftBuffer[sizeof(RexxNumberStringBase)];
- CHAR SaveRightBuffer[sizeof(RexxNumberStringBase)];
+ char AccumBuffer[sizeof(RexxNumberStringBase)];
+ char SaveLeftBuffer[sizeof(RexxNumberStringBase)];
+ char SaveRightBuffer[sizeof(RexxNumberStringBase)];
RexxNumberString *result;
char *Num1, *Num2;
char *resultPtr, *Output, *rightPtr, *leftPtr, *SaveLeftPtr, *SaveRightPtr;
@@ -822,7 +822,7 @@
/*********************************************************************/
{
RexxNumberStringBase *left;
- CHAR leftBuffer[sizeof(RexxNumberStringBase)];
+ char leftBuffer[sizeof(RexxNumberStringBase)];
char *Num1, *Num2;
char *resultPtr, *leftPtr, *result;
int multiplier, rc;
Modified: sandbox/rick/warnings2/kernel/classes/StackClass.hpp
===================================================================
--- sandbox/rick/warnings2/kernel/classes/StackClass.hpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/classes/StackClass.hpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -72,7 +72,7 @@
inline void decrementTop() { top = (top == 0) ? u_size - 1 : top - 1; }
inline void incrementTop() { if (++top >= u_size) top = 0; }
/* (other->size + 1) was wrong !? */
- inline void copyEntries(RexxStack *other) { memcpy((PCHAR)this->stack, other->stack, other->u_size * sizeof(RexxObject *)); this->top = other->top; }
+ inline void copyEntries(RexxStack *other) { memcpy((char *)this->stack, other->stack, other->u_size * sizeof(RexxObject *)); this->top = other->top; }
size_t top; /* top position on the stack */
RexxObject *stack[1]; /* stack entries */
Modified: sandbox/rick/warnings2/kernel/classes/StringClass.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/classes/StringClass.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/classes/StringClass.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -1153,12 +1153,16 @@
/******************************************************************************/
{
RexxString *newCopy; /* new copy of string */
- const char *Current; /* current string location */
+ // NOTE: since we're doing value comparisons on single character values here,
+ // we need to process this as unsigned characters to handle values
+ // greater than 0x7f.
+ const unsigned char *Current; /* current string location */
size_t i; /* string length */
BOOL NonDisplay; /* have non-displayables */
i = this->getLength(); /* get the length */
- Current = this->getStringData(); /* point to the start */
+ /* point to the start */
+ Current = (const unsigned char *)this->getStringData();
NonDisplay = FALSE; /* no non-displayable characters */
for (; i > 0; i--) { /* loop for the entire string */
@@ -1861,7 +1865,7 @@
return_oref(new_string(string, length));
}
-native3 (size_t, STRING_GET, size_t, start, PCHAR, buffer, size_t, bufl)
+native3 (size_t, STRING_GET, size_t, start, char *, buffer, size_t, bufl)
/******************************************************************************/
/* Function: External interface to the object method */
/******************************************************************************/
Modified: sandbox/rick/warnings2/kernel/classes/StringClassConversion.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/classes/StringClassConversion.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/classes/StringClassConversion.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -219,9 +219,9 @@
if (Hex) /* hex version? */
/* raise the hex message */
- report_exception1(Error_Incorrect_method_invhex, new_string((PCHAR)&c, 1));
+ report_exception1(Error_Incorrect_method_invhex, new_string((char *)&c, 1));
else
- report_exception1(Error_Incorrect_method_invbin, new_string((PCHAR)&c, 1));
+ report_exception1(Error_Incorrect_method_invbin, new_string((char *)&c, 1));
}
}
}
Modified: sandbox/rick/warnings2/kernel/classes/StringClassMisc.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/classes/StringClassMisc.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/classes/StringClassMisc.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -246,7 +246,7 @@
RexxObject *DataType(
RexxString *String, /* string value */
- UCHAR Option ) /* requested option */
+ unsigned char Option ) /* requested option */
/*********************************************************************/
/* Function: Perform primitive datatype validation */
/*********************************************************************/
Modified: sandbox/rick/warnings2/kernel/expression/BuiltinFunctions.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/expression/BuiltinFunctions.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/expression/BuiltinFunctions.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -1110,7 +1110,7 @@
// only certain styles support this option
if (strchr("BDMWL", style) != NULL)
{
- report_exception4(Error_Incorrect_call_format_incomp_sep, new_cstring(CHAR_DATE), IntegerOne, new_string((PCHAR)&style, 1), IntegerFour);
+ report_exception4(Error_Incorrect_call_format_incomp_sep, new_cstring(CHAR_DATE), IntegerOne, new_string((char *)&style, 1), IntegerFour);
}
if (osep->getLength() > 1 || (osep->getLength() == 1 && strchr(ALPHANUM, osep->getChar(0)) != NULL))
{
@@ -1132,7 +1132,7 @@
{
if (strchr("BDMWL", style2) != NULL)
{
- report_exception4(Error_Incorrect_call_format_incomp_sep, new_cstring(CHAR_DATE), IntegerThree, new_string((PCHAR)&style2, 1), IntegerFive);
+ report_exception4(Error_Incorrect_call_format_incomp_sep, new_cstring(CHAR_DATE), IntegerThree, new_string((char *)&style2, 1), IntegerFive);
}
// explicitly specified delimiter, we need to validate this first
if (isep->getLength() > 1 || (isep->getLength() == 1 && strchr(ALPHANUM, isep->getChar(0)) != NULL))
@@ -1162,7 +1162,7 @@
/* bad value? */
if (basedays == (int)NO_LONG || !timestamp.setBaseDate(basedays))
{
- report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_DATE), indate, new_string((PCHAR)&style2, 1));
+ report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_DATE), indate, new_string((char *)&style2, 1));
}
break;
}
@@ -1173,7 +1173,7 @@
int64_t basetime;
if (!Numerics::objectToInt64(indate, basetime) || !timestamp.setBaseTime(basetime))
{
- report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_DATE), indate, new_string((PCHAR)&style2, 1));
+ report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_DATE), indate, new_string((char *)&style2, 1));
}
break;
}
@@ -1184,7 +1184,7 @@
int64_t basetime;
if (!Numerics::objectToInt64(indate, basetime) || !timestamp.setUnixTime(basetime))
{
- report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_DATE), indate, new_string((PCHAR)&style2, 1));
+ report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_DATE), indate, new_string((char *)&style2, 1));
}
break;
}
@@ -1197,7 +1197,7 @@
if (yearday == (int)NO_LONG || yearday < 0 || yearday > YEAR_DAYS + 1 ||
(yearday > YEAR_DAYS && !LeapYear(current.year)))
{
- report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_DATE), indate, new_string((PCHAR)&style2, 1));
+ report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_DATE), indate, new_string((char *)&style2, 1));
}
// set the date directly
timestamp.setDate(current.year, yearday);
@@ -1221,7 +1221,7 @@
break;
default:
- report_exception4(Error_Incorrect_call_list, new_cstring(CHAR_DATE), IntegerThree, new_string("BDEFNOTSU", 7), new_string((PCHAR)&style2, 1));
+ report_exception4(Error_Incorrect_call_list, new_cstring(CHAR_DATE), IntegerThree, new_string("BDEFNOTSU", 7), new_string((char *)&style2, 1));
break;
}
// if there's a formatting error
@@ -1234,7 +1234,7 @@
}
else
{
- report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_DATE), indate, new_string((PCHAR)&style2, 1));
+ report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_DATE), indate, new_string((char *)&style2, 1));
}
}
}
@@ -1372,7 +1372,7 @@
// the input timestamp is not valid with the elapsed time options
if (style == 'R' || style == 'E')
{
- report_exception2(Error_Incorrect_call_invalid_conversion, new_cstring(CHAR_TIME), new_string((PCHAR)&style, 1));
+ report_exception2(Error_Incorrect_call_invalid_conversion, new_cstring(CHAR_TIME), new_string((char *)&style, 1));
}
bool valid = true; // assume this is a good timestamp
timestamp.clear(); // clear everything out
@@ -1421,7 +1421,7 @@
int64_t basetime;
if (!Numerics::objectToInt64(intime, basetime) || !timestamp.setBaseTime(basetime))
{
- report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_TIME), intime, new_string((PCHAR)&style2, 1));
+ report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_TIME), intime, new_string((char *)&style2, 1));
}
break;
}
@@ -1432,7 +1432,7 @@
int64_t basetime;
if (!Numerics::objectToInt64(intime, basetime) || !timestamp.setUnixTime(basetime))
{
- report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_TIME), intime, new_string((PCHAR)&style2, 1));
+ report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_TIME), intime, new_string((char *)&style2, 1));
}
break;
}
@@ -1444,7 +1444,7 @@
}
if (!valid) /* not convert cleanly? */
{
- report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_TIME), intime, new_string((PCHAR)&style2, 1) );
+ report_exception3(Error_Incorrect_call_format_invalid, new_cstring(CHAR_TIME), intime, new_string((char *)&style2, 1) );
}
}
@@ -1562,8 +1562,8 @@
RexxString *start; /* starting position */
RexxString *end; /* ending position */
RexxString *result; /* XRANGE result */
- UCHAR startchar; /* starting character */
- UCHAR endchar; /* ending character */
+ unsigned char startchar; /* starting character */
+ unsigned char endchar; /* ending character */
LONG length; /* length of result */
LONG i; /* loop counter */
@@ -2255,7 +2255,7 @@
RexxString *command; /* stream command */
RexxString *command_upper; /* stream command upper case */
RexxObject *result; /* function result */
- CHAR action_char; /* reduced action character */
+ char action_char; /* reduced action character */
RexxString *fullName; /* fully qual'd stream name */
BOOL added;
BOOL fOpen = FALSE; /* open flag */
Modified: sandbox/rick/warnings2/kernel/expression/ExpressionFunction.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/expression/ExpressionFunction.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/expression/ExpressionFunction.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -72,7 +72,7 @@
/* set the default target */
OrefSet(this, this->u_name, function_name);
/* save the argument count */
- this->argument_count = (UCHAR)argCount;
+ this->argument_count = (uint8_t)argCount;
while (argCount > 0) { /* now copy the argument pointers */
/* in reverse order */
OrefSet(this, this->arguments[--argCount], arglist->pop());
Modified: sandbox/rick/warnings2/kernel/expression/ExpressionStack.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/expression/ExpressionStack.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/expression/ExpressionStack.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -108,7 +108,7 @@
INT argcount, /* count of arguments */
INT min, /* minimum required arguments */
INT max, /* maximum required arguments */
- PCHAR function ) /* function being processed */
+ char *function ) /* function being processed */
/******************************************************************************/
/* Function: Verify that a function has received all of its required */
/* arguments, and did not receive extras. */
@@ -182,7 +182,7 @@
RexxInteger *RexxExpressionStack::requiredIntegerArg(
int position, /* position of argument */
int argcount, /* count of arguments */
- PCHAR function) /* function being processed */
+ char *function) /* function being processed */
/******************************************************************************/
/* Function: Retrieve an object from the expression stack and potentially */
/* convert it into an integer argument. */
@@ -211,7 +211,7 @@
RexxInteger *RexxExpressionStack::optionalIntegerArg(
int position, /* position of argument */
int argcount, /* count of arguments */
- PCHAR function) /* function being processed */
+ char *function) /* function being processed */
/******************************************************************************/
/* Function: Retrieve an object from the expression stack and potentially */
/* convert it into an integer argument. */
Modified: sandbox/rick/warnings2/kernel/expression/ExpressionStack.hpp
===================================================================
--- sandbox/rick/warnings2/kernel/expression/ExpressionStack.hpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/expression/ExpressionStack.hpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -56,11 +56,11 @@
void live();
void liveGeneral();
void flatten(RexxEnvelope *);
- void expandArgs(int, int, int, PCHAR);
+ void expandArgs(int, int, int, char *);
RexxString * requiredStringArg(int);
RexxString * optionalStringArg(int);
- RexxInteger *requiredIntegerArg(int, int, PCHAR);
- RexxInteger *optionalIntegerArg(int, int, PCHAR);
+ RexxInteger *requiredIntegerArg(int, int, char *);
+ RexxInteger *optionalIntegerArg(int, int, char *);
void migrate(RexxActivity *);
inline void setFrame(RexxObject **frames, size_t items) { stack = frames; size = items; top = stack; *top = OREF_NULL; }
Modified: sandbox/rick/warnings2/kernel/instructions/CallInstruction.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/CallInstruction.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/CallInstruction.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -1,12 +1,12 @@
/*----------------------------------------------------------------------------*/
/* */
/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved. */
-/* Copyright (c) 2005-2006 Rexx Language Association. All rights reserved. */
+/* Copyright (c) 2005-2007 Rexx Language Association. All rights reserved. */
/* */
/* This program and the accompanying materials are made available under */
/* the terms of the Common Public License v1.0 which accompanies this */
/* distribution. A copy is also available at the following address: */
-/* http://www.oorexx.org/license.html */
+/* http://www.oorexx.org/license.html */
/* */
/* Redistribution and use in source and binary forms, with or */
/* without modification, are permitted provided that the following */
@@ -36,7 +36,7 @@
/* */
/*----------------------------------------------------------------------------*/
/******************************************************************************/
-/* REXX Translator CallInstruction.c */
+/* REXX Translator CallInstruction.c */
/* */
/* Primitive Call Parse Class */
/* */
@@ -59,8 +59,8 @@
RexxString *_condition, /* CALL ON/OFF condition */
size_t argCount, /* count of arguments */
RexxQueue *argList, /* call arguments */
- CHAR flags, /* CALL flags */
- CHAR builtin_index) /* builtin routine index */
+ size_t flags, /* CALL flags */
+ size_t builtin_index) /* builtin routine index */
/******************************************************************************/
/* Function: Complete CALL instruction object */
/******************************************************************************/
@@ -72,7 +72,7 @@
i_flags = flags; /* copy the flags */
call_builtin_index = builtin_index; /* and the builtin function index */
/* no arguments */
- call_argument_count = (UCHAR)argCount;
+ call_argument_count = (uint8_t)argCount;
while (argCount > 0) { /* now copy the argument pointers */
/* in reverse order */
OrefSet(this, this->arguments[--argCount], argList->pop());
Modified: sandbox/rick/warnings2/kernel/instructions/CallInstruction.hpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/CallInstruction.hpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/CallInstruction.hpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -47,8 +47,8 @@
#include "RexxInstruction.hpp"
typedef struct callshortoverlay {
- UCHAR builtin_index; /* builtin function index */
- UCHAR argument_count; /* count of arguments */
+ uint8_t builtin_index; /* builtin function index */
+ uint8_t argument_count; /* count of arguments */
} CALLSHORTOVERLAY;
#define call_nointernal 0x01 /* bypass internal routine calls */
@@ -77,7 +77,7 @@
public:
inline void *operator new(size_t size, void *ptr) {return ptr;};
- RexxInstructionCall(RexxObject *, RexxString *, size_t, RexxQueue *, CHAR, CHAR);
+ RexxInstructionCall(RexxObject *, RexxString *, size_t, RexxQueue *, size_t, size_t);
inline RexxInstructionCall(RESTORETYPE restoreType) { ; };
void live();
void liveGeneral();
Modified: sandbox/rick/warnings2/kernel/instructions/EndInstruction.hpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/EndInstruction.hpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/EndInstruction.hpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -65,8 +65,8 @@
void execute(RexxActivation *, RexxExpressionStack *);
inline RexxString *endName() { return this->name; };
- inline void setStyle(INT type) { this->instructionInfo.flags = type; };
- inline INT getStyle(void) { return this->instructionInfo.flags; };
+ inline void setStyle(size_t type) { this->instructionInfo.flags = type; };
+ inline size_t getStyle(void) { return this->instructionInfo.flags; };
RexxString * name; /* specified control variable name */
};
Modified: sandbox/rick/warnings2/kernel/instructions/NumericInstruction.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/NumericInstruction.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/NumericInstruction.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -51,7 +51,7 @@
RexxInstructionNumeric::RexxInstructionNumeric(
RexxObject *_expression, /* optional expression */
USHORT type, /* type of numeric instruction */
- UCHAR flags) /* processing flags */
+ size_t flags) /* processing flags */
/****************************************************************************/
/* Function: Execute a REXX NUMERIC instruction */
/****************************************************************************/
Modified: sandbox/rick/warnings2/kernel/instructions/NumericInstruction.hpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/NumericInstruction.hpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/NumericInstruction.hpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -51,7 +51,7 @@
class RexxInstructionNumeric : public RexxInstructionExpression {
public:
inline void *operator new(size_t size, void *ptr) {return ptr;};
- RexxInstructionNumeric(RexxObject *, USHORT, UCHAR);
+ RexxInstructionNumeric(RexxObject *, USHORT, size_t);
inline RexxInstructionNumeric(RESTORETYPE restoreType) { ; };
void execute(RexxActivation *, RexxExpressionStack *);
};
Modified: sandbox/rick/warnings2/kernel/instructions/ParseInstruction.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/ParseInstruction.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/ParseInstruction.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -58,7 +58,7 @@
RexxInstructionParse::RexxInstructionParse(
RexxObject *_expression, /* string expression source */
USHORT string_source, /* source of the parsed string */
- UCHAR flags, /* option flags */
+ size_t flags, /* option flags */
LONG templateCount, /* count of template items */
RexxQueue *parse_template ) /* parsing template array */
/******************************************************************************/
Modified: sandbox/rick/warnings2/kernel/instructions/ParseInstruction.hpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/ParseInstruction.hpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/ParseInstruction.hpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -56,7 +56,7 @@
class RexxInstructionParse : public RexxInstruction {
public:
inline void *operator new(size_t size, void *ptr) {return ptr;};
- RexxInstructionParse(RexxObject *, USHORT, UCHAR, LONG, RexxQueue *);
+ RexxInstructionParse(RexxObject *, USHORT, size_t, LONG, RexxQueue *);
inline RexxInstructionParse(RESTORETYPE restoreType) { ; };
void execute(RexxActivation *, RexxExpressionStack *);
void live();
Modified: sandbox/rick/warnings2/kernel/instructions/RexxInstruction.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/RexxInstruction.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/RexxInstruction.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -58,7 +58,7 @@
ClearObject(this); /* start out clean */
this->hashvalue = 0; /* clear out the instruction info */
/* record the instruction type */
- this->instructionInfo.type = (UCHAR)type;
+ this->instructionInfo.type = (uint8_t)type;
if (clause != OREF_NULL) { /* have a clause object? */
/* fill in default location info */
clause->getLocation(&clauseLocation);
Modified: sandbox/rick/warnings2/kernel/instructions/RexxInstruction.hpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/RexxInstruction.hpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/RexxInstruction.hpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -71,8 +71,8 @@
this->offset = off; };
void setEnd(size_t line, size_t off) { this->endLine = line;
this->endOffset = off; };
- inline void setType(char type) {this->instructionInfo.type = type; };
- inline char getType(void) {return this->instructionInfo.type; };
+ inline void setType(size_t type) {this->instructionInfo.type = type; };
+ inline size_t getType(void) {return this->instructionInfo.type; };
inline size_t getLine() { return this->lineNumber; };
size_t offset; /* offset of instruction start */
Modified: sandbox/rick/warnings2/kernel/instructions/SignalInstruction.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/SignalInstruction.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/SignalInstruction.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -52,7 +52,7 @@
RexxObject *_expression, /* expression for signal value */
RexxString *_condition, /* signalled condition */
RexxString *_name, /* signal target name */
- int flags ) /* option flags */
+ size_t flags ) /* option flags */
/******************************************************************************/
/* Initialize a SIGNAL instruction */
/******************************************************************************/
Modified: sandbox/rick/warnings2/kernel/instructions/SignalInstruction.hpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/SignalInstruction.hpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/SignalInstruction.hpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -52,7 +52,7 @@
class RexxInstructionSignal : public RexxInstructionCallBase {
public:
inline void *operator new(size_t size, void *ptr) {return ptr;};
- RexxInstructionSignal(RexxObject *, RexxString *, RexxString *, int);
+ RexxInstructionSignal(RexxObject *, RexxString *, RexxString *, size_t);
inline RexxInstructionSignal(RESTORETYPE restoreType) { ; };
void execute(RexxActivation *, RexxExpressionStack *);
void live();
Modified: sandbox/rick/warnings2/kernel/instructions/TraceInstruction.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/TraceInstruction.cpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/TraceInstruction.cpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -51,7 +51,7 @@
RexxInstructionTrace::RexxInstructionTrace(
RexxObject *_expression, /* TRACE VALUE expression */
USHORT trace, /* trace setting */
- UCHAR debug_flags, /* new debug setting */
+ size_t debug_flags, /* new debug setting */
LONG debug_skip ) /* debug clauses to skip */
/******************************************************************************/
/* Function: Initialize a trace instruction */
Modified: sandbox/rick/warnings2/kernel/instructions/TraceInstruction.hpp
===================================================================
--- sandbox/rick/warnings2/kernel/instructions/TraceInstruction.hpp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/instructions/TraceInstruction.hpp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -59,7 +59,7 @@
class RexxInstructionTrace : public RexxInstruction {
public:
inline void *operator new(size_t size, void *ptr) {return ptr;};
- RexxInstructionTrace(RexxObject *, USHORT, UCHAR, LONG);
+ RexxInstructionTrace(RexxObject *, USHORT, size_t, LONG);
inline RexxInstructionTrace(RESTORETYPE restoreType) { ; };
void live();
void liveGeneral();
Modified: sandbox/rick/warnings2/kernel/messages/gencat.inp
===================================================================
--- sandbox/rick/warnings2/kernel/messages/gencat.inp 2007-10-28 19:42:57 UTC (rev 1118)
+++ sandbox/rick/warnings2/kernel/messages/gencat.inp 2007-10-28 21:20:18 UTC (rev 1119)
@@ -1029,7 +1029,7 @@
443 Method argument &1 must be one of &2; found "&3"
$ Error_Incorrect_method_option
-444 Method option must be one of &1; found "&2"
+444 Method option must be one of "&1"; found "&2"
$ Error_Incorrect_method_string
445 Method argument &1 must have a string value
@@ -1406,9 +1406,6 @@
$ Error_Accessing_aete
571 Error accessing event information in AETE
-$ Error_Translation_duplicate_attribute
-571 Duplicate ::ATTRIBUTE directive instruction
-
$ Error_Launching_app
572 Error launching application "&1"
@@ -1464,7 +1461,7 @@
589 OLE error
$ Error_Unknown_OLE_Error
-590 An unknown OLE error occured (HRESULT=&1).
+590 An unknown OLE error occurred (HRESULT=&1).
$ Error_Variant2Rexx...
[truncated message content] |