cleanup: eliminate missing sentinel warnings

This commit is contained in:
Jon Trulson
2014-03-24 18:26:10 -06:00
parent 165af415d1
commit 4312a1190b
12 changed files with 41 additions and 41 deletions

View File

@@ -59,7 +59,7 @@ patternProps2Pat(
{
Tt_pattern pat;
XtVaGetValues( instance->patternProps_shellform,
XmNuserData, &pat, 0 );
XmNuserData, &pat, NULL );
return pat;
}
@@ -96,7 +96,7 @@ _DtTtPatternWidgetUpdate(
if (tt_is_err( status )) {
printout = tt_status_message( status );
}
XtVaSetValues( instance->patternText, XmNvalue, printout, 0 );
XtVaSetValues( instance->patternText, XmNvalue, printout, NULL );
_DtTtPatternSetUpdating( pat, True );
@@ -119,7 +119,7 @@ _DtTtPatternWidgetUpdate(
choice = instance->categoryChoice_items.HANDLE_ROTATE_item;
break;
}
XtVaSetValues( instance->categoryChoice, XmNmenuHistory, choice, 0 );
XtVaSetValues( instance->categoryChoice, XmNmenuHistory, choice, NULL );
_DtTtPatternSetUpdating( pat, False );
}
@@ -356,7 +356,7 @@ DtTtPatternWidgetCreate(
dtb_pattern_props_pattern_props_initialize( instance, parent );
widget = instance->patternProps;
XtVaSetValues( instance->patternProps_shellform, XmNuserData, pat, 0 );
XtVaSetValues( instance->patternProps_shellform, XmNuserData, pat, NULL );
status = tt_pattern_user_set( pat, DtTtPatWidgetKey, widget );
if (tt_is_err( status )) {
XtDestroyWidget( widget );
@@ -375,7 +375,7 @@ DtTtPatternWidgetCreate(
labelStream << "Tt_pattern " << (void *)pat << ends;
XtVaSetValues( instance->patternProps,
XmNtitle, labelStream.str(),
0 );
NULL );
delete labelStream.str();
_DtTtPatternWidgetUpdate( instance, pat );

View File

@@ -98,10 +98,10 @@ _DtSessionChooserSet(
instance, dtb_ttsnoop_ttsnoop_win.ttsnoopWin );
}
DtTtSetLabel( instance->sessionOkButton, okString );
XtVaSetValues( instance->sessionChooser, XmNtitle, title, 0 );
XtVaSetValues( instance->sessionChooser, XmNtitle, title, NULL );
// Remember dialog mode, entity
XtVaSetValues( instance->sessionOkButton, XmNuserData, choice, 0 );
XtVaSetValues( instance->sessionCancelButton, XmNuserData, entity, 0 );
XtVaSetValues( instance->sessionOkButton, XmNuserData, choice, NULL );
XtVaSetValues( instance->sessionCancelButton, XmNuserData, entity, NULL );
XmTextPosition last =
XmTextFieldGetLastPosition( instance->sessionText );
Time when =
@@ -209,9 +209,9 @@ sessionOK(
session = 0;
}
XtPointer val;
XtVaGetValues( instance->sessionOkButton, XmNuserData, &val, 0 );
XtVaGetValues( instance->sessionOkButton, XmNuserData, &val, NULL );
_DtSessionChooserAction choice = (_DtSessionChooserAction) (long) val;
XtVaGetValues( instance->sessionCancelButton, XmNuserData, &val, 0 );
XtVaGetValues( instance->sessionCancelButton, XmNuserData, &val, NULL );
Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
switch (choice) {
Tt_status status;
@@ -267,7 +267,7 @@ sessionHelp(
DtbSessionChooserSessionChooserInfo instance =
(DtbSessionChooserSessionChooserInfo)clientData;
XtPointer val;
XtVaGetValues( instance->sessionOkButton, XmNuserData, &val, 0 );
XtVaGetValues( instance->sessionOkButton, XmNuserData, &val, NULL );
_DtSessionChooserAction choice = (_DtSessionChooserAction) (long) val;
Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
switch (choice) {

View File

@@ -182,10 +182,10 @@ _DtStringChooserSet(
}
DtTtSetLabel( instance->stringOkButton, okString );
DtTtSetLabel( instance->stringText_label, valueLabel );
XtVaSetValues( instance->stringChooser, XmNtitle, title, 0 );
XtVaSetValues( instance->stringChooser, XmNtitle, title, NULL );
// Remember dialog mode, entity
XtVaSetValues( instance->stringOkButton, XmNuserData, choice, 0 );
XtVaSetValues( instance->stringCancelButton, XmNuserData, entity, 0 );
XtVaSetValues( instance->stringOkButton, XmNuserData, choice, NULL );
XtVaSetValues( instance->stringCancelButton, XmNuserData, entity, NULL );
XmTextPosition last = XmTextFieldGetLastPosition( instance->stringText );
Time when = XtLastTimestampProcessed( XtDisplay( instance->stringText ));
XmTextFieldSetSelection( instance->stringText, 0, last, when );
@@ -242,9 +242,9 @@ stringOkayed(
string = 0;
}
XtPointer val;
XtVaGetValues( instance->stringOkButton, XmNuserData, &val, 0 );
XtVaGetValues( instance->stringOkButton, XmNuserData, &val, NULL );
_DtStringChooserAction choice = (_DtStringChooserAction) (long) val;
XtVaGetValues( instance->stringCancelButton, XmNuserData, &val, 0 );
XtVaGetValues( instance->stringCancelButton, XmNuserData, &val, NULL );
Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
switch (choice) {
Tt_status status;
@@ -327,7 +327,7 @@ stringHelp(
DtbStringChooserStringChooserInfo instance =
(DtbStringChooserStringChooserInfo)clientData;
XtPointer val;
XtVaGetValues( instance->stringOkButton, XmNuserData, &val, 0 );
XtVaGetValues( instance->stringOkButton, XmNuserData, &val, NULL );
_DtStringChooserAction choice = (_DtStringChooserAction) (long) val;
Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
switch (choice) {

View File

@@ -208,10 +208,10 @@ _DtTtChooserSet(
XtVaSetValues( instance->chooserList,
XmNitemCount, itemCount,
XmNitems, items,
0 );
NULL );
XmListDeselectAllItems( instance->chooserList );
XmTextFieldSetString( instance->chooserText, 0 );
XtVaSetValues( instance->chooser, XmNtitle, title, 0 );
XtVaSetValues( instance->chooser, XmNtitle, title, NULL );
std::ostrstream valuesStream;
valuesStream << itemCount << " " << valuesLabel;
@@ -221,8 +221,8 @@ _DtTtChooserSet(
delete valuesStream.str();
// Remember dialog mode, entity
XtVaSetValues( instance->chooserOkButton, XmNuserData, choice, 0 );
XtVaSetValues( instance->chooserCancelButton, XmNuserData, entity, 0 );
XtVaSetValues( instance->chooserOkButton, XmNuserData, choice, NULL );
XtVaSetValues( instance->chooserCancelButton, XmNuserData, entity, NULL );
XtManageChild( instance->chooser_shellform );
}
@@ -272,7 +272,7 @@ choiceSelected(
DtbTtChooserChooserInfo instance = (DtbTtChooserChooserInfo)clientData;
XmListCallbackStruct *info = (XmListCallbackStruct *)callData;
int choice;
XtVaGetValues( instance->chooserOkButton, XmNuserData, &choice, 0 );
XtVaGetValues( instance->chooserOkButton, XmNuserData, &choice, NULL );
DtTtType type;
Boolean isString = False;
switch ((_DtTtChooserAction)choice) {
@@ -340,7 +340,7 @@ choiceOkayed(
DtbTtChooserChooserInfo instance = (DtbTtChooserChooserInfo)clientData;
char *text = XmTextFieldGetString( instance->chooserText );
int ival;
XtVaGetValues( instance->chooserOkButton, XmNuserData, &ival, 0 );
XtVaGetValues( instance->chooserOkButton, XmNuserData, &ival, NULL );
_DtTtChooserAction choice = (_DtTtChooserAction)ival;
Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
switch (choice) {
@@ -374,25 +374,25 @@ choiceOkayed(
break;
case _DtTtChooserMessageOpSet:
XtVaGetValues( instance->chooserCancelButton,
XmNuserData, &xtPtr, 0 );
XmNuserData, &xtPtr, NULL );
_DtTtMessageUpdate( (Tt_message)xtPtr, choice, text );
XtUnmanageChild( instance->chooser_shellform );
break;
case _DtTtChooserPatternOpAdd:
XtVaGetValues( instance->chooserCancelButton,
XmNuserData, &xtPtr, 0 );
XmNuserData, &xtPtr, NULL );
_DtTtPatternUpdate( (Tt_pattern)xtPtr, choice, text );
XtUnmanageChild( instance->chooser_shellform );
break;
case _DtTtChooserMessageHandlerSet:
XtVaGetValues( instance->chooserCancelButton,
XmNuserData, &xtPtr, 0 );
XmNuserData, &xtPtr, NULL );
_DtTtMessageUpdate( (Tt_message)xtPtr, choice, text );
XtUnmanageChild( instance->chooser_shellform );
break;
case _DtTtChooserPatternSenderAdd:
XtVaGetValues( instance->chooserCancelButton,
XmNuserData, &xtPtr, 0 );
XmNuserData, &xtPtr, NULL );
_DtTtPatternUpdate( (Tt_pattern)xtPtr, choice, text );
XtUnmanageChild( instance->chooser_shellform );
break;
@@ -592,7 +592,7 @@ ttChooserHelp(
/*** DTB_USER_CODE_START vvv Add C code below vvv ***/
DtbTtChooserChooserInfo instance = (DtbTtChooserChooserInfo)clientData;
int ival;
XtVaGetValues( instance->chooserOkButton, XmNuserData, &ival, 0 );
XtVaGetValues( instance->chooserOkButton, XmNuserData, &ival, NULL );
_DtTtChooserAction choice = (_DtTtChooserAction)ival;
Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
switch (choice) {