remove-cast-warnings.patch

   1 ---
   2
   3  source/file.c        |    2 +-
   4  source/highlight.c   |    2 +-
   5  source/macro.c       |   12 ++++++------
   6  source/preferences.c |   21 +++++++++++----------
   7  source/userCmds.c    |   10 +++++-----
   8  util/prefFile.c      |    4 ++--
   9  6 files changed, 26 insertions(+), 25 deletions(-)
  10
  11 diff --quilt old/source/preferences.c new/source/preferences.c
  12 --- old/source/preferences.c
  13 +++ new/source/preferences.c
  14 @@ -2283,9 +2283,8 @@ void SetLanguageMode(WindowInfo *window,
  15  {
  16      Widget menu;
  17      WidgetList items;
  18 -    int n;
  19 -    Cardinal nItems;
  20 -    void *userData;
  21 +    Cardinal nItems, n;
  22 +    XtPointer userData;
  23
  24      /* Do mode-specific actions */
  25      reapplyLanguageMode(window, mode, forceNewDefaults);
  26 @@ -2294,9 +2293,9 @@ void SetLanguageMode(WindowInfo *window,
  27      if (IsTopDocument(window)) {
  28         XtVaGetValues(window->langModeCascade, XmNsubMenuId, &menu, NULL);
  29         XtVaGetValues(menu, XmNchildren, &items, XmNnumChildren, &nItems, NULL);
  30 -       for (n=0; n<(int)nItems; n++) {
  31 +        for (n=0; n<nItems; n++) {
  32             XtVaGetValues(items[n], XmNuserData, &userData, NULL);
  33 -           XmToggleButtonSetState(items[n], (int)userData == mode, False);
  34 +            XmToggleButtonSetState(items[n], userData == (XtPointer)(long)mode, False);
  35         }
  36      }
  37  }
  38 @@ -5148,7 +5147,7 @@ static void updateLanguageModeSubmenu(Wi
  39                 xmToggleButtonGadgetClass, menu,
  40                 XmNlabelString, s1=XmStringCreateSimple(LanguageModes[i]->name),
  41                 XmNmarginHeight, 0,
  42 -               XmNuserData, (void *)i,
  43 +                XmNuserData, (XtPointer)(long)i,
  44                 XmNset, window->languageMode==i, NULL);
  45          XmStringFree(s1);
  46         XtAddCallback(btn, XmNvalueChangedCallback, setLangModeCB, window);
  47 @@ -5160,23 +5159,25 @@ static void setLangModeCB(Widget w, XtPo
  48  {
  49      WindowInfo *window = WidgetToWindow(MENU_WIDGET(w));
  50      char *params[1];
  51 -    void *mode;
  52 +    int mode;
  53 +    XtPointer userData;
  54
  55      if (!XmToggleButtonGetState(w))
  56         return;
  57
  58      /* get name of language mode stored in userData field of menu item */
  59 -    XtVaGetValues(w, XmNuserData, &mode, NULL);
  60 +    XtVaGetValues(w, XmNuserData, &userData, NULL);
  61 +    mode = (int)(long)userData;
  62
  63      /* If the mode didn't change, do nothing */
  64 -    if (window->languageMode == (int)mode)
  65 +    if (window->languageMode == mode)
  66         return;
  67
  68      /* redo syntax highlighting word delimiters, etc. */
  69  /*
  70      reapplyLanguageMode(window, (int)mode, False);
  71  */
  72 -    params[0] = (((int)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)mode]->name;
  73 +    params[0] = (mode == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[mode]->name;
  74      XtCallActionProc(window->textArea, "set_language_mode", NULL, params, 1);
  75  }
  76
  77 diff --quilt old/source/userCmds.c new/source/userCmds.c
  78 --- old/source/userCmds.c
  79 +++ new/source/userCmds.c
  80 @@ -1111,13 +1111,13 @@ static void dimSelDepItemsInMenu(Widget
  81      XtVaGetValues(menuPane, XmNchildren, &items, XmNnumChildren, &nItems, NULL);
  82      for (n=0; n<(int)nItems; n++) {
  83         XtVaGetValues(items[n], XmNuserData, &userData, NULL);
  84 -       if (userData !=  (XtPointer)PERMANENT_MENU_ITEM) {
  85 +        if (userData !=  PERMANENT_MENU_ITEM) {
  86             if (XtClass(items[n]) == xmCascadeButtonWidgetClass) {
  87                 XtVaGetValues(items[n], XmNsubMenuId, &subMenu, NULL);
  88                 dimSelDepItemsInMenu(subMenu, menuList, nMenuItems, sensitive);
  89             } else {
  90 -               index = (int)userData - 10;
  91 -               if (index <0 || index >= nMenuItems)
  92 +                index = (int)(long)userData - 10;
  93 +                if (index < 0 || index >= nMenuItems)
  94                     return;
  95                 if (menuList[index]->input == FROM_SELECTION)
  96                     XtSetSensitive(items[n], sensitive);
  97 @@ -1928,7 +1928,7 @@ static Widget createUserMenuItem(Widget
  98             XmNlabelString, st1,
  99             XmNacceleratorText, st2,
 100             XmNmnemonic, f->mnemonic,
 101 -           XmNuserData, (XtPointer)(index+10), NULL);
 102 +            XmNuserData, (XtPointer)(long)(index + 10), NULL);
 103      XtAddCallback(btn, XmNactivateCallback, cbRtn, cbArg);
 104      XmStringFree(st1);
 105      XmStringFree(st2);
 106 @@ -1979,7 +1979,7 @@ static void deleteMenuItems(Widget menuP
 107      /* delete all of the widgets not marked as PERMANENT_MENU_ITEM */
 108      for (n=0; n<(int)nItems; n++) {
 109         XtVaGetValues(items[n], XmNuserData, &userData, NULL);
 110 -       if (userData !=  (XtPointer)PERMANENT_MENU_ITEM) {
 111 +        if (userData !=  PERMANENT_MENU_ITEM) {
 112             if (XtClass(items[n]) == xmCascadeButtonWidgetClass) {
 113                 XtVaGetValues(items[n], XmNsubMenuId, &subMenuID, NULL);
 114
 115 diff --quilt old/source/file.c new/source/file.c
 116 --- old/source/file.c
 117 +++ new/source/file.c
 118 @@ -1914,7 +1914,7 @@ static void setFormatCB(Widget w, XtPoin
 119      if (XmToggleButtonGetState(w)) {
 120          XtPointer userData;
 121          XtVaGetValues(w, XmNuserData, &userData, NULL);
 122 -        *(int*) clientData = (int) userData;
 123 +        *(int*) clientData = (int)(long) userData;
 124      }
 125  }
 126
 127 diff --quilt old/source/macro.c new/source/macro.c
 128 --- old/source/macro.c
 129 +++ new/source/macro.c
 130 @@ -2921,7 +2921,7 @@ static int dialogMS(WindowInfo *window,
 131          readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
 132         btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
 133                 XmNlabelString, s1=XmStringCreateSimple(btnLabel),
 134 -               XmNuserData, (XtPointer)(i+1), NULL);
 135 +                XmNuserData, (XtPointer)(long)(i + 1), NULL);
 136         XtAddCallback(btn, XmNactivateCallback, dialogBtnCB, window);
 137         XmStringFree(s1);
 138      }
 139 @@ -2962,7 +2962,7 @@ static void dialogBtnCB(Widget w, XtPoin
 140         return; /* shouldn't happen */
 141      if (XtClass(w) == xmPushButtonWidgetClass) {
 142         XtVaGetValues(w, XmNuserData, &userData, NULL);
 143 -       retVal.val.n = (int)userData;
 144 +        retVal.val.n = (int)(long)userData;
 145      } else
 146         retVal.val.n = 1;
 147      retVal.tag = INT_TAG;
 148 @@ -3098,7 +3098,7 @@ static int stringDialogMS(WindowInfo *wi
 149          readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
 150         btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
 151                 XmNlabelString, s1=XmStringCreateSimple(btnLabel),
 152 -               XmNuserData, (XtPointer)(i+1), NULL);
 153 +                XmNuserData, (XtPointer)(long)(i + 1), NULL);
 154         XtAddCallback(btn, XmNactivateCallback, stringDialogBtnCB, window);
 155         XmStringFree(s1);
 156      }
 157 @@ -3152,7 +3152,7 @@ static void stringDialogBtnCB(Widget w,
 158         returned in w. */
 159      if (XtClass(w) == xmPushButtonWidgetClass) {
 160         XtVaGetValues(w, XmNuserData, &userData, NULL);
 161 -       btnNum = (int)userData;
 162 +        btnNum = (int)(long)userData;
 163      } else
 164         btnNum = 1;
 165
 166 @@ -3677,7 +3677,7 @@ static int listDialogMS(WindowInfo *wind
 167        readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
 168        btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
 169                XmNlabelString, s1=XmStringCreateSimple(btnLabel),
 170 -              XmNuserData, (XtPointer)(i+1), NULL);
 171 +              XmNuserData, (XtPointer)(long)(i + 1), NULL);
 172        XtAddCallback(btn, XmNactivateCallback, listDialogBtnCB, window);
 173        XmStringFree(s1);
 174      }
 175 @@ -3757,7 +3757,7 @@ static void listDialogBtnCB(Widget w, Xt
 176         returned in w. */
 177      if (XtClass(w) == xmPushButtonWidgetClass) {
 178        XtVaGetValues(w, XmNuserData, &userData, NULL);
 179 -      btnNum = (int)userData;
 180 +      btnNum = (int)(long)userData;
 181      } else
 182        btnNum = 1;
 183
 184 diff --quilt old/util/prefFile.c new/util/prefFile.c
 185 --- old/util/prefFile.c
 186 +++ new/util/prefFile.c
 187 @@ -353,9 +353,9 @@ static int stringToPref(const char *stri
 188         *(int *)rsrcDescrip->valueAddr = 0;
 189         return False;
 190        case PREF_STRING:
 191 -       if ((int)strlen(string) >= (int)rsrcDescrip->arg)
 192 +        if (strlen(string) >= (size_t)rsrcDescrip->arg)
 193             return False;
 194 -       strncpy(rsrcDescrip->valueAddr, string, (int)rsrcDescrip->arg);
 195 +       strncpy(rsrcDescrip->valueAddr, string, (size_t)rsrcDescrip->arg);
 196         return True;
 197        case PREF_ALLOC_STRING:
 198         *(char **)rsrcDescrip->valueAddr = XtMalloc(strlen(string) + 1);
 199 diff --quilt old/source/highlight.c new/source/highlight.c
 200 --- old/source/highlight.c
 201 +++ new/source/highlight.c
 202 @@ -512,7 +512,7 @@ void* GetHighlightInfo(WindowInfo *windo
 203      if (!pattern) {
 204         return NULL;
 205      }
 206 -    return (void*)pattern->userStyleIndex;
 207 +    return (void*)(long)pattern->userStyleIndex;
 208  }
 209
 210  /*