From ea4341b1ef218191ac607870fa2dc893e10c1562 Mon Sep 17 00:00:00 2001 From: neil Date: Sat, 20 Oct 2007 19:07:14 +0000 Subject: [PATCH] Fixed warnings and removed comparisons against TRUE. git-svn-id: https://svn.aros.org:8080/svn/aros/trunk/AROS@27088 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- rom/workbench/addappicona.c | 30 +++++++++++++++--------------- rom/workbench/addappmenuitema.c | 6 +++--- rom/workbench/addappwindowdropzonea.c | 7 +++---- rom/workbench/openworkbenchobjecta.c | 11 +++++------ rom/workbench/workbenchcontrola.c | 2 +- 5 files changed, 27 insertions(+), 29 deletions(-) diff --git a/rom/workbench/addappicona.c b/rom/workbench/addappicona.c index f95e85de5..aef4b37ab 100644 --- a/rom/workbench/addappicona.c +++ b/rom/workbench/addappicona.c @@ -207,8 +207,8 @@ { AROS_LIBFUNC_INIT - struct TagItem *tagState = taglist; - struct TagItem *tag; + const struct TagItem *tagState = taglist; + const struct TagItem *tag; struct AppIcon *appIcon; if (diskobj == NULL || msgport == NULL || @@ -235,84 +235,84 @@ switch (tag->ti_Tag) { case WBAPPICONA_SupportsOpen: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_SupportsOpen; } break; case WBAPPICONA_SupportsCopy: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_SupportsCopy; } break; case WBAPPICONA_SupportsRename: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_SupportsRename; } break; case WBAPPICONA_SupportsInformation: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_SupportsInformation; } break; case WBAPPICONA_SupportsSnapshot: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_SupportsSnapshot; } break; case WBAPPICONA_SupportsUnSnapshot: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_SupportsUnSnapshot; } break; case WBAPPICONA_SupportsLeaveOut: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_SupportsLeaveOut; } break; case WBAPPICONA_SupportsPutAway: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_SupportsPutAway; } break; case WBAPPICONA_SupportsDelete: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_SupportsDelete; } break; case WBAPPICONA_SupportsFormatDisk: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_SupportsFormatDisk; } break; case WBAPPICONA_SupportsEmptyTrash: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_SupportsEmptyTrash; } break; case WBAPPICONA_PropagatePosition: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_PropagatePosition; } @@ -326,7 +326,7 @@ break; case WBAPPICONA_NotifySelectState: - if (tag->ti_Data == TRUE) + if (tag->ti_Data) { appIcon->ai_Flags |= WBAPPICONF_NotifySelectState; } diff --git a/rom/workbench/addappmenuitema.c b/rom/workbench/addappmenuitema.c index f96e00b96..d1d7e0108 100644 --- a/rom/workbench/addappmenuitema.c +++ b/rom/workbench/addappmenuitema.c @@ -84,12 +84,12 @@ BOOL keyUsed(STRPTR key, struct WorkbenchBase *WorkbenchBase); { AROS_LIBFUNC_INIT - struct TagItem *tagState = taglist; - struct TagItem *tag; + const struct TagItem *tagState = taglist; + const struct TagItem *tag; struct AppMenuItem *appMenuItem; - appMenuItem = AllocVec(sizeof(struct AppMenuItem), MEMF_ANY | MEMF_CLEAR); + appMenuItem = AllocVec(sizeof(struct AppMenuItem), MEMF_CLEAR); if (appMenuItem == NULL) { diff --git a/rom/workbench/addappwindowdropzonea.c b/rom/workbench/addappwindowdropzonea.c index f3d0b5ac4..d1d8ed187 100644 --- a/rom/workbench/addappwindowdropzonea.c +++ b/rom/workbench/addappwindowdropzonea.c @@ -124,13 +124,12 @@ { AROS_LIBFUNC_INIT - struct TagItem *tagState = tags; - struct TagItem *tag; + const struct TagItem *tagState = tags; + const struct TagItem *tag; struct AppWindowDropZone *dropZone; - dropZone = AllocVec(sizeof(struct AppWindowDropZone), - MEMF_ANY | MEMF_CLEAR); + dropZone = AllocVec(sizeof(struct AppWindowDropZone), MEMF_CLEAR); if (dropZone == NULL) { diff --git a/rom/workbench/openworkbenchobjecta.c b/rom/workbench/openworkbenchobjecta.c index 3917e954c..b9569c2a8 100644 --- a/rom/workbench/openworkbenchobjecta.c +++ b/rom/workbench/openworkbenchobjecta.c @@ -197,9 +197,8 @@ BOOL __WB_BuildArguments(struct WBStartup *startup, BPTR lock, CONST_STRPTR na && strlen(icon->do_DefaultTool) > 0 ) { - BPTR lock = (BPTR)NULL, lock2 = (BPTR)NULL, - parent = (BPTR)NULL, parent2 = (BPTR)NULL; - + BPTR lock = (BPTR)NULL, parent = (BPTR)NULL; + lock = Lock(name, ACCESS_READ); if (lock != (BPTR)NULL) parent = ParentDir(lock); @@ -307,8 +306,8 @@ STRPTR __CLI_BuildCommandLine struct WorkbenchBase *WorkbenchBase ) { - struct TagItem *tstate = tags; - struct TagItem *tag = NULL; + const struct TagItem *tstate = tags; + const struct TagItem *tag = NULL; BPTR lastLock = NULL; STRPTR buffer = NULL; ULONG length = strlen(command) + 3 /* NULL + 2 '"' */; @@ -454,7 +453,7 @@ BOOL __WB_BuildArguments struct WorkbenchBase *WorkbenchBase ) { - struct TagItem *tstate = tags, + const struct TagItem *tstate = tags, *tag = NULL; BPTR lastLock = NULL; struct WBArg *args = NULL; diff --git a/rom/workbench/workbenchcontrola.c b/rom/workbench/workbenchcontrola.c index f8ce2b68e..e81e1dd8f 100644 --- a/rom/workbench/workbenchcontrola.c +++ b/rom/workbench/workbenchcontrola.c @@ -52,7 +52,7 @@ { AROS_LIBFUNC_INIT - struct TagItem *tstate = tags, + const struct TagItem *tstate = tags, *tag; BOOL rc = TRUE; -- 2.11.4.GIT