See patch.
>From c13ad5f7e0ff04c49033710eb85372c136932022 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf <pascal.stu...@cubes.de>
Date: Tue, 23 Jul 2013 13:49:26 +0200
Subject: [PATCH] ttsnoop: deal with iostream.h and missing sentinels.
Replacing strstream may be possible, but requires more work and a better
understanding of the code.
---
cde/programs/ttsnoop/DtTt.C | 4 ++--
cde/programs/ttsnoop/argChooser_stubs.C.src | 30 ++++++++++++------------
cde/programs/ttsnoop/callbackChooser_stubs.C.src | 18 +++++++-------
cde/programs/ttsnoop/fileChooser_stubs.C.src | 8 +++----
cde/programs/ttsnoop/messageProps_stubs.C.src | 22 ++++++++---------
cde/programs/ttsnoop/tt_c++.h | 2 +-
cde/programs/ttsnoop/ttsnoop.C.src | 2 +-
7 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/cde/programs/ttsnoop/DtTt.C b/cde/programs/ttsnoop/DtTt.C
index 0f55c75..ee000a7 100644
--- a/cde/programs/ttsnoop/DtTt.C
+++ b/cde/programs/ttsnoop/DtTt.C
@@ -455,7 +455,7 @@ DtTtSetLabel(
return TT_OK;
}
XmString labelXmString = XmStringCreateLocalized( (String)string );
- XtVaSetValues( labelWidget, XmNlabelString, labelXmString, 0 );
+ XtVaSetValues( labelWidget, XmNlabelString, labelXmString, NULL );
XmStringFree( labelXmString );
return TT_OK;
}
@@ -730,7 +730,7 @@ _DtHelped(
)
{
char *topics;
- XtVaGetValues( helpDialog, DtNstringData, &topics, 0 );
+ XtVaGetValues( helpDialog, DtNstringData, &topics, NULL );
if (! _DtCanHelp( topics )) {
return False;
}
diff --git a/cde/programs/ttsnoop/argChooser_stubs.C.src
b/cde/programs/ttsnoop/argChooser_stubs.C.src
index 52028a3..e001515 100644
--- a/cde/programs/ttsnoop/argChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/argChooser_stubs.C.src
@@ -76,7 +76,7 @@ _DtArgChooserSet(
modeChoice = instance->modeChoice_items.INOUT_item;
break;
}
- XtVaSetValues( instance->modeChoice, XmNmenuHistory, modeChoice, 0 );
+ XtVaSetValues( instance->modeChoice, XmNmenuHistory, modeChoice, NULL );
Widget valType = instance->argValTypeChoice_items.None_item;
if (! noValue) {
@@ -88,11 +88,11 @@ _DtArgChooserSet(
argValTypeChoice_items.int_item;
}
}
- XtVaSetValues( instance->argValTypeChoice, XmNmenuHistory, valType, 0 );
+ XtVaSetValues( instance->argValTypeChoice, XmNmenuHistory, valType,
NULL);
XmTextFieldSetString( instance->vtypeText, vtype );
- XtVaSetValues( instance->argIvalBox, DtNposition, ival, 0 );
- XtVaSetValues( instance->argValText, XmNvalue, val, 0 );
+ XtVaSetValues( instance->argIvalBox, DtNposition, ival, NULL );
+ XtVaSetValues( instance->argValText, XmNvalue, val, NULL );
_DtArgChooserSet( choice, entity, nth );
}
@@ -152,16 +152,16 @@ _DtArgChooserSet(
}
DtTtSetLabel( instance->argChooserOkButton, okString );
- XtVaSetValues( instance->argChooser, XmNtitle, title, 0 );
+ XtVaSetValues( instance->argChooser, XmNtitle, title, NULL );
DtTtSetLabel( instance->vtypeText_label, vtypeLabel );
XtSetSensitive( instance->vtypeText, vtypeActive );
XtSetSensitive( instance->modeChoice, modeActive );
// Remember dialog mode, entity, nth
- XtVaSetValues( instance->argChooserOkButton, XmNuserData, choice, 0 );
+ XtVaSetValues( instance->argChooserOkButton, XmNuserData, choice, NULL
);
XtVaSetValues( instance->argChooserCancelButton,
- XmNuserData, entity, 0 );
- XtVaSetValues( instance->argChooserHelpButton, XmNuserData, nth, 0 );
+ XmNuserData, entity, NULL );
+ XtVaSetValues( instance->argChooserHelpButton, XmNuserData, nth, NULL );
if (vtypeActive) {
// Pre-select vtype text
@@ -393,12 +393,12 @@ argOkayed(
_DtArgChooserAction choice = _DtArgChooseNone;
XtPointer pval;
- XtVaGetValues( instance->argChooserOkButton, XmNuserData, &pval, 0 );
+ XtVaGetValues( instance->argChooserOkButton, XmNuserData, &pval, NULL );
choice = (_DtArgChooserAction) (long) pval;
- XtVaGetValues( instance->argChooserCancelButton, XmNuserData, &pval, 0 );
+ XtVaGetValues( instance->argChooserCancelButton, XmNuserData, &pval, NULL
);
msg = (Tt_message)pval;
pat = (Tt_pattern)pval;
- XtVaGetValues( instance->argChooserHelpButton, XmNuserData, &pval, 0 );
+ XtVaGetValues( instance->argChooserHelpButton, XmNuserData, &pval, NULL );
nth = (int) (long) pval;
char *vtype = XmTextFieldGetString( instance->vtypeText );
@@ -408,7 +408,7 @@ argOkayed(
}
Widget modeWidget;
- XtVaGetValues( instance->modeChoice, XmNmenuHistory, &modeWidget, 0 );
+ XtVaGetValues( instance->modeChoice, XmNmenuHistory, &modeWidget, NULL );
Tt_mode mode = TT_IN;
if (modeWidget == instance->modeChoice_items.OUT_item) {
mode = TT_OUT;
@@ -420,13 +420,13 @@ argOkayed(
int ival = 0;
Widget valTypeWidget;
XtVaGetValues( instance->argValTypeChoice,
- XmNmenuHistory, &valTypeWidget, 0 );
+ XmNmenuHistory, &valTypeWidget, NULL );
if (valTypeWidget == instance->argValTypeChoice_items.char_item) {
val = XmTextGetString( instance->argValText );
} else if (valTypeWidget == instance->argValTypeChoice_items.int_item) {
// see _DtArgChooserAction invariant in DtTt.h
choice = (_DtArgChooserAction)(choice + 1);
- XtVaGetValues( instance->argIvalBox, DtNposition, &ival, 0 );
+ XtVaGetValues( instance->argIvalBox, DtNposition, &ival, NULL );
}
switch (choice) {
@@ -468,7 +468,7 @@ argHelp(
DtbArgChooserArgChooserInfo instance =
(DtbArgChooserArgChooserInfo)clientData;
XtPointer val;
- XtVaGetValues( instance->argChooserOkButton, XmNuserData, &val, 0 );
+ XtVaGetValues( instance->argChooserOkButton, XmNuserData, &val, NULL );
_DtArgChooserAction choice = (_DtArgChooserAction) (long) val;
Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
switch (choice) {
diff --git a/cde/programs/ttsnoop/callbackChooser_stubs.C.src
b/cde/programs/ttsnoop/callbackChooser_stubs.C.src
index 490c217..735609e 100644
--- a/cde/programs/ttsnoop/callbackChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/callbackChooser_stubs.C.src
@@ -75,11 +75,11 @@ _DtTtMsgCbChooserSet(
dtb_callback_chooser_callback_chooser_initialize(
instance, dtb_ttsnoop_ttsnoop_win.ttsnoopWin );
}
- XtVaSetValues( instance->callbackChooser, XmNtitle, title, 0 );
+ XtVaSetValues( instance->callbackChooser, XmNtitle, title, NULL );
XtPointer xtPtr = (XtPointer)isMessage;
- XtVaSetValues( instance->callbackAddButton, XmNuserData, xtPtr, 0 );
+ XtVaSetValues( instance->callbackAddButton, XmNuserData, xtPtr, NULL );
XtVaSetValues( instance->callbackAddCancelButton,
- XmNuserData, entity, 0 );
+ XmNuserData, entity, NULL );
XtManageChild( instance->callbackChooser_shellform );
}
@@ -674,16 +674,16 @@ callbackOkayed(
Tt_pattern pat = 0;
XtPointer xtPtr = 0;
int isMessage = 0;
- XtVaGetValues( instance->callbackAddButton, XmNuserData, &xtPtr, 0 );
+ XtVaGetValues( instance->callbackAddButton, XmNuserData, &xtPtr, NULL );
isMessage = (int) (long) xtPtr;
- XtVaGetValues( instance->callbackAddCancelButton, XmNuserData, &xtPtr, 0 );
+ XtVaGetValues( instance->callbackAddCancelButton, XmNuserData, &xtPtr,
NULL );
msg = (Tt_message)xtPtr;
pat = (Tt_pattern)xtPtr;
What2Do action = DoOpen;
Widget actionWidget;
XtVaGetValues( instance->msgActionChoice,
- XmNmenuHistory, &actionWidget, 0 );
+ XmNmenuHistory, &actionWidget, NULL );
if (actionWidget == instance->msgActionChoice_items.Open_item) {
action = DoOpen;
} else if (actionWidget == instance->msgActionChoice_items.Print_item) {
@@ -703,7 +703,7 @@ callbackOkayed(
int destroy = 0;
Boolean destroyBool;
XtVaGetValues( instance->msgDestroyChoice_items.Destroy_item,
- XmNset, &destroyBool, 0 );
+ XmNset, &destroyBool, NULL );
if (destroyBool) {
destroy = 1;
}
@@ -711,7 +711,7 @@ callbackOkayed(
Tt_callback_action returnVal = TT_CALLBACK_CONTINUE;
Widget returnWidget;
XtVaGetValues( instance->msgReturnChoice,
- XmNmenuHistory, &returnWidget, 0 );
+ XmNmenuHistory, &returnWidget, NULL );
if (returnWidget == instance->msgReturnChoice_items.PROCESSED_item) {
returnVal = TT_CALLBACK_PROCESSED;
}
@@ -755,7 +755,7 @@ callbackHelp(
(DtbCallbackChooserCallbackChooserInfo)clientData;
XtPointer xtPtr = 0;
int isMessage = 0;
- XtVaGetValues( instance->callbackAddButton, XmNuserData, &xtPtr, 0 );
+ XtVaGetValues( instance->callbackAddButton, XmNuserData, &xtPtr, NULL );
isMessage = (int) (long) xtPtr;
Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
if (isMessage) {
diff --git a/cde/programs/ttsnoop/fileChooser_stubs.C.src
b/cde/programs/ttsnoop/fileChooser_stubs.C.src
index 051caa8..bc724a4 100644
--- a/cde/programs/ttsnoop/fileChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/fileChooser_stubs.C.src
@@ -137,15 +137,15 @@ _DtFileChooserSet(
instance, dtb_ttsnoop_ttsnoop_win.ttsnoopWin );
}
XmString okXmString = XmStringCreateLocalized( okString );
- XtVaSetValues( instance->fchooser, XmNokLabelString, okXmString, 0 );
+ XtVaSetValues( instance->fchooser, XmNokLabelString, okXmString, NULL );
XmStringFree( okXmString );
- XtVaSetValues( instance->fchooser_shell, XmNtitle, title, 0 );
+ XtVaSetValues( instance->fchooser_shell, XmNtitle, title, NULL );
// Remember dialog mode, entity
FileChooserInfo *info = new FileChooserInfo;
info->choice = choice;
info->entity = entity;
- XtVaSetValues( instance->fchooser, XmNuserData, info, 0 );
+ XtVaSetValues( instance->fchooser, XmNuserData, info, NULL );
XtManageChild( instance->fchooser );
}
@@ -214,7 +214,7 @@ fileOkayed(
path = 0;
}
XtPointer xtPtr;
- XtVaGetValues( instance->fchooser, XmNuserData, &xtPtr, 0 );
+ XtVaGetValues( instance->fchooser, XmNuserData, &xtPtr, NULL );
FileChooserInfo *info = (FileChooserInfo *)xtPtr;
Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
std::ostrstream script;
diff --git a/cde/programs/ttsnoop/messageProps_stubs.C.src
b/cde/programs/ttsnoop/messageProps_stubs.C.src
index bcc152c..bd7ac28 100644
--- a/cde/programs/ttsnoop/messageProps_stubs.C.src
+++ b/cde/programs/ttsnoop/messageProps_stubs.C.src
@@ -96,7 +96,7 @@ messageProps2Msg(
{
Tt_message msg;
XtVaGetValues( instance->messageProps_shellform,
- XmNuserData, &msg, 0 );
+ XmNuserData, &msg, NULL );
return msg;
}
@@ -140,7 +140,7 @@ _DtTtMessageWidgetUpdate(
if (tt_is_err( status )) {
printout = tt_status_message( status );
}
- XtVaSetValues( instance->messageText, XmNvalue, printout, 0 );
+ XtVaSetValues( instance->messageText, XmNvalue, printout, NULL );
if (level == _DtTtMessageRePrint) {
return;
}
@@ -204,7 +204,7 @@ _DtTtMessageWidgetUpdate(
}
int val = tt_message_status( msg );
- XtVaSetValues( instance->statusBox, DtNposition, val, 0 );
+ XtVaSetValues( instance->statusBox, DtNposition, val, NULL );
char *status_string = tt_status_string( (Tt_status)val );
DtTtSetLabel( instance->statusLabel, status_string );
tt_free( status_string );
@@ -225,7 +225,7 @@ _DtTtMessageWidgetUpdate(
choice = instance->classChoice_items.OFFER_item;
break;
}
- XtVaSetValues( instance->classChoice, XmNmenuHistory, choice, 0 );
+ XtVaSetValues( instance->classChoice, XmNmenuHistory, choice, NULL );
switch (tt_message_address( msg )) {
case TT_PROCEDURE:
@@ -245,7 +245,7 @@ _DtTtMessageWidgetUpdate(
choice = instance->addressChoice_items.ADDRESS_LAST_item;
break;
}
- XtVaSetValues( instance->addressChoice, XmNmenuHistory, choice, 0 );
+ XtVaSetValues( instance->addressChoice, XmNmenuHistory, choice, NULL );
switch (tt_message_scope( msg )) {
case TT_SCOPE_NONE:
@@ -265,7 +265,7 @@ _DtTtMessageWidgetUpdate(
choice = instance->scopeChoice_items.FILE_IN_SESSION_item;
break;
}
- XtVaSetValues( instance->scopeChoice, XmNmenuHistory, choice, 0 );
+ XtVaSetValues( instance->scopeChoice, XmNmenuHistory, choice, NULL );
switch (tt_message_disposition( msg )) {
case TT_DISCARD:
@@ -282,7 +282,7 @@ _DtTtMessageWidgetUpdate(
choice = instance->dispositionChoice_items.QUEUE_START_item;
break;
}
- XtVaSetValues( instance->dispositionChoice, XmNmenuHistory, choice, 0);
+ XtVaSetValues( instance->dispositionChoice, XmNmenuHistory, choice,
NULL);
_DtTtMessageSetUpdating( msg, False );
}
@@ -599,7 +599,7 @@ DtTtMessageWidgetCreate(
dtb_message_props_message_props_initialize( instance, parent );
widget = instance->messageProps;
- XtVaSetValues( instance->messageProps_shellform, XmNuserData, msg, 0 );
+ XtVaSetValues( instance->messageProps_shellform, XmNuserData, msg, NULL
);
status = tt_message_user_set( msg, DtTtMsgWidgetKey, widget );
if (tt_is_err( status )) {
XtDestroyWidget( widget );
@@ -624,7 +624,7 @@ DtTtMessageWidgetCreate(
labelStream << "Tt_message " << (void *)msg;
XtVaSetValues( instance->messageProps,
XmNtitle, labelStream.str(),
- 0 );
+ NULL );
delete labelStream.str();
_DtTtMessageWidgetUpdate( instance, msg, _DtTtMessageFullUpdate );
@@ -1726,9 +1726,9 @@ setStatus(
return;
}
int val;
- XtVaGetValues( instance->statusBox, DtNposition, &val, 0 );
+ XtVaGetValues( instance->statusBox, DtNposition, &val, NULL );
XmString statusName = DtTtStatusString( (Tt_status)val );
- XtVaSetValues( instance->statusLabel, XmNlabelString, statusName, 0 );
+ XtVaSetValues( instance->statusLabel, XmNlabelString, statusName, NULL );
XmStringFree( statusName );
Tt_status status = tt_message_status_set( msg, val );
DtTtSetLabel( instance->messageFooterLabel,
diff --git a/cde/programs/ttsnoop/tt_c++.h b/cde/programs/ttsnoop/tt_c++.h
index f10b59b..931b7d8 100644
--- a/cde/programs/ttsnoop/tt_c++.h
+++ b/cde/programs/ttsnoop/tt_c++.h
@@ -29,7 +29,7 @@
#ifndef TT_CXX_H
#define TT_CXX_H
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
using namespace std;
#else
diff --git a/cde/programs/ttsnoop/ttsnoop.C.src
b/cde/programs/ttsnoop/ttsnoop.C.src
index d457bbe..12cd67f 100644
--- a/cde/programs/ttsnoop/ttsnoop.C.src
+++ b/cde/programs/ttsnoop/ttsnoop.C.src
@@ -766,7 +766,7 @@ main(int argc, char **argv)
snoopPatIsRegistered ? "Off" : "On" );
if (optMapOnOutput) {
XtVaSetValues( dtb_ttsnoop_ttsnoop_win.ttsnoopPane,
- DtNmapOnOutput, optMapOnOutput, 0 );
+ DtNmapOnOutput, optMapOnOutput, NULL );
}
installSignalHandler();
--
1.8.3.1
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
