From 491ff2228fe4e7b84d796391e8ab5d86983feea7 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Thu, 9 Aug 2012 12:18:30 -0600 Subject: [PATCH] Deal with the fact that modern compilers assume different scoping rules Patch from Pascal Stumpf : So here are all the patches that deal with the fact that modern compilers assume different scoping rules for variables declared in for loops. On Linux, -fpermissive has been added as a compiler flag to compensate for this old C code, but I think it is the wrong approach. Sorry, couldn't help sneaking in a || defined(CSRG_BASED) and some casts needed for other reasons ... --- cde/lib/DtSvc/DtCodelibs/buf.C | 3 +- cde/lib/tt/bin/ttdbserverd/dm_server.C | 3 +- cde/programs/dtmail/dtmail/ComposeCmds.C | 3 +- cde/programs/dtmail/dtmail/DmxPrintOptions.C | 7 +++-- cde/programs/dtmail/dtmail/RoamMenuWindow.C | 30 +++++++++---------- .../dtmail/libDtMail/RFC/V3BodyPart.C | 4 ++- cde/programs/dtsearchpath/libCliSrv/cstring.C | 6 ++-- 7 files changed, 32 insertions(+), 24 deletions(-) diff --git a/cde/lib/DtSvc/DtCodelibs/buf.C b/cde/lib/DtSvc/DtCodelibs/buf.C index 13abb899..e13e2020 100644 --- a/cde/lib/DtSvc/DtCodelibs/buf.C +++ b/cde/lib/DtSvc/DtCodelibs/buf.C @@ -118,7 +118,8 @@ _SHXbuf::reset(boolean g, boolean comp) char ** _SHXbuf::vector() { - for (int i = 0; i < vec.size(); i++) + int i; + for (i = 0; i < vec.size(); i++) vec[i] = &buf[long(vec[i])]; vec[i] = NULL; diff --git a/cde/lib/tt/bin/ttdbserverd/dm_server.C b/cde/lib/tt/bin/ttdbserverd/dm_server.C index bd099272..0b4eb9c8 100644 --- a/cde/lib/tt/bin/ttdbserverd/dm_server.C +++ b/cde/lib/tt/bin/ttdbserverd/dm_server.C @@ -1079,7 +1079,8 @@ _tt_isopen_1(_Tt_isopen_args *args, SVCXPRT * /* transp */) int l = db_path.len(); int tl = strlen("TT_DB"); - for (int j = 0; j(10); _propui_array = new DtVirtArray(10); @@ -240,7 +241,7 @@ DmxPrintOptions::DmxPrintOptions ( nitems = DMX_ARRAY_SIZE(hdrftr_values);; strings = (char **) XtMalloc( nitems * sizeof(char*) ); data = (void **) XtMalloc( nitems * sizeof(void*) ); - for (int i=0; iget_scrolling_list(), XmNhelpCallback, - HelpCB, DTMAILMSGLISTID); + HelpCB, (void *)DTMAILMSGLISTID); XtVaSetValues(_list->get_scrolling_list(), XmNuserData, this, NULL); _rowOfButtons = @@ -2863,7 +2863,7 @@ RoamMenuWindow::addToRowOfButtons() TRUE, this ); ci = new ButtonInterface (_rowOfButtons, _delete_button); w = ci->baseWidget(); - XtAddCallback(w, XmNhelpCallback, HelpCB, DTMAILDELBTNID); + XtAddCallback(w, XmNhelpCallback, HelpCB, (void *)DTMAILDELBTNID); XtVaSetValues(w, XmNleftAttachment, XmATTACH_FORM, XmNtopAttachment, XmATTACH_FORM, @@ -2880,7 +2880,7 @@ RoamMenuWindow::addToRowOfButtons() TRUE, this ); ci = new ButtonInterface (_rowOfButtons, _next_button); w = ci->baseWidget(); - XtAddCallback(w, XmNhelpCallback, HelpCB, DTMAILNEXTBTNID); + XtAddCallback(w, XmNhelpCallback, HelpCB, (void *)DTMAILNEXTBTNID); XtVaSetValues(w, XmNleftAttachment, XmATTACH_WIDGET, XmNleftWidget, prev_widget, @@ -2899,7 +2899,7 @@ RoamMenuWindow::addToRowOfButtons() TRUE, this ); ci = new ButtonInterface (_rowOfButtons, _previous_button); w = ci->baseWidget(); - XtAddCallback(w, XmNhelpCallback, HelpCB, DTMAILPREVBTNID); + XtAddCallback(w, XmNhelpCallback, HelpCB, (void *)DTMAILPREVBTNID); XtVaSetValues(w, XmNleftAttachment, XmATTACH_WIDGET, XmNleftWidget, prev_widget, @@ -2920,7 +2920,7 @@ RoamMenuWindow::addToRowOfButtons() FALSE ); ci = new ButtonInterface (_rowOfButtons, _replySender_button); w = ci->baseWidget(); - XtAddCallback(w, XmNhelpCallback, HelpCB, DTMAILREPLYBTNID); + XtAddCallback(w, XmNhelpCallback, HelpCB, (void *)DTMAILREPLYBTNID); XtVaSetValues(w, XmNleftAttachment, XmATTACH_WIDGET, XmNleftWidget, prev_widget, @@ -2938,7 +2938,7 @@ RoamMenuWindow::addToRowOfButtons() TRUE, TRUE, this); ci = new ButtonInterface (_rowOfButtons, _print_button); w = ci->baseWidget(); - XtAddCallback(w, XmNhelpCallback, HelpCB, DTMAILPRINTBTNID); + XtAddCallback(w, XmNhelpCallback, HelpCB, (void *)DTMAILPRINTBTNID); XtVaSetValues(w, XmNleftAttachment, XmATTACH_WIDGET, XmNleftWidget, prev_widget, @@ -3292,7 +3292,7 @@ RoamMenuWindow::createContainerList() void RoamMenuWindow::createOpenContainerList(CmdList * open_container) { - int ncontainers; + int ncontainers, i; char *container_name; ContainerMenuCmd *container_cmd; @@ -3327,7 +3327,7 @@ RoamMenuWindow::createOpenContainerList(CmdList * open_container) _open_container_containerlist = new DtVirtArray(ncontainers); - for (int i=0; icontainerName(); if (NULL != container_name) @@ -3490,7 +3490,7 @@ RoamMenuWindow::construct_file_menu() void RoamMenuWindow::createCopyList(CmdList * copy_to) { - int ncontainers; + int ncontainers, i; char *container_name; ContainerMenuCmd *container_cmd; @@ -3550,7 +3550,7 @@ RoamMenuWindow::createCopyList(CmdList * copy_to) _copyto_containerlist = new DtVirtArray (ncontainers); - for (int i=0; icontainerName(); if (NULL != container_name) @@ -3930,7 +3930,7 @@ RoamMenuWindow::construct_compose_menu() void RoamMenuWindow::construct_move_menu() { - int ncontainers; + int ncontainers, i; char *container_name; ContainerMenuCmd *container_cmd; @@ -3967,7 +3967,7 @@ RoamMenuWindow::construct_move_menu() delete _move_containerlist; _move_containerlist = new DtVirtArray (ncontainers); - for (int i=0; icontainerName(); if (NULL != container_name) diff --git a/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C b/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C index 007d7261..0d4fa1ba 100644 --- a/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C +++ b/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C @@ -328,9 +328,11 @@ V3BodyPart::checksum(DtMailEnv & error) static int countTypes(char ** types) { + int count; + if (NULL == types) return 0; - for (int count = 0; *types; types++, count++) { + for (count = 0; *types; types++, count++) { continue; } diff --git a/cde/programs/dtsearchpath/libCliSrv/cstring.C b/cde/programs/dtsearchpath/libCliSrv/cstring.C index be3067fc..dc735e23 100644 --- a/cde/programs/dtsearchpath/libCliSrv/cstring.C +++ b/cde/programs/dtsearchpath/libCliSrv/cstring.C @@ -510,12 +510,14 @@ CTokenizedString::~CTokenizedString() CString CTokenizedString::next() { char * q = 0; +char * p; +int i; if (cursor) { if (strlen(delimiter) == 1) q = strchr(cursor,delimiter[0]); else { - for (int i = 0; i < strlen(cursor); i++) + for (i = 0; i < strlen(cursor); i++) if (strchr(delimiter,cursor[i])) { q = &cursor[i]; break; @@ -533,7 +535,7 @@ char * q = 0; // eliminate trailing white space if (skipWhiteSpace) { - for (char *p = q; isspace(*(p-1)); p--); + for (p = q; isspace(*(p-1)); p--); *p = 0; } CString result(cursor); -- 2.25.1