[Emacs-diffs] trunk r114848: Prefer 'unsigned long' to 'long unsigned int' and 'unsigned long int'.

[Dmitry Antipov]

------------------------------------------------------------
revno: 114848
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-10-29 20:08:08 +0400
message:
  Prefer 'unsigned long' to 'long unsigned int' and 'unsigned long int'.
  * ftxfont.c (ftxfont_get_gcs):
  * gtkutil.c (xg_set_widget_bg, xg_set_background_color):
  * xfaces.c (x_free_colors, x_free_dpy_colors)
  (x_create_gc, unload_color):
  * xselect.c (x_property_data_to_lisp):
  * xsettings.c (parse_settings):
  * xterm.c (x_copy_color, x_alloc_lighter_color, x_setup_relief_color)
  (get_bits_and_offset): Adjust definition.
  * frame.c (XParseGeometry): Adjust locals.
  * lisp.h (toplevel): Adjust EMACS_UINT type definition.
  * regex.h (toplevel): Likewise for reg_syntax_t.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/ftxfont.c                  ftxfont.c-20091113204419-o5vbwnq5f7feedwu-8544
  src/gtkutil.c                  gtkutil.c-20091113204419-o5vbwnq5f7feedwu-2527
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253
  src/regex.h                    regex.h-20091113204419-o5vbwnq5f7feedwu-517
  src/xfaces.c                   xfaces.c-20091113204419-o5vbwnq5f7feedwu-560
  src/xselect.c                  xselect.c-20091113204419-o5vbwnq5f7feedwu-543
  src/xsettings.c                xsettings.c-20091117210551-bqxn4u9uesl3d17a-4
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-29 14:46:23 +0000
+++ b/src/ChangeLog     2013-10-29 16:08:08 +0000
@@ -1,3 +1,18 @@
+2013-10-29  Dmitry Antipov  <address@hidden>
+
+       Prefer 'unsigned long' to 'long unsigned int' and 'unsigned long int'.
+       * ftxfont.c (ftxfont_get_gcs):
+       * gtkutil.c (xg_set_widget_bg, xg_set_background_color):
+       * xfaces.c (x_free_colors, x_free_dpy_colors)
+       (x_create_gc, unload_color):
+       * xselect.c (x_property_data_to_lisp):
+       * xsettings.c (parse_settings):
+       * xterm.c (x_copy_color, x_alloc_lighter_color, x_setup_relief_color)
+       (get_bits_and_offset): Adjust definition.
+       * frame.c (XParseGeometry): Adjust locals.
+       * lisp.h (toplevel): Adjust EMACS_UINT type definition.
+       * regex.h (toplevel): Likewise for reg_syntax_t.
+
 2013-10-29  Stefan Monnier  <address@hidden>
 
        * eval.c (run_hook_with_args): Use FUNCTIONP.

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-10-02 15:38:12 +0000
+++ b/src/frame.c       2013-10-29 16:08:08 +0000
@@ -3844,7 +3844,7 @@
 {
   int mask = NoValue;
   char *strind;
-  unsigned long int tempWidth, tempHeight;
+  unsigned long tempWidth, tempHeight;
   long int tempX, tempY;
   char *nextCharacter;
 

=== modified file 'src/ftxfont.c'
--- a/src/ftxfont.c     2013-10-25 06:55:36 +0000
+++ b/src/ftxfont.c     2013-10-29 16:08:08 +0000
@@ -57,7 +57,7 @@
 /* Return an array of 6 GCs for antialiasing.  */
 
 static GC *
-ftxfont_get_gcs (struct frame *f, long unsigned int foreground, long unsigned 
int background)
+ftxfont_get_gcs (struct frame *f, unsigned long foreground, unsigned long 
background)
 {
   XColor color;
   XGCValues xgcv;

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2013-09-17 07:06:42 +0000
+++ b/src/gtkutil.c     2013-10-29 16:08:08 +0000
@@ -1038,7 +1038,7 @@
 /* Set the background of widget W to PIXEL.  */
 
 static void
-xg_set_widget_bg (struct frame *f, GtkWidget *w, long unsigned int pixel)
+xg_set_widget_bg (struct frame *f, GtkWidget *w, unsigned long pixel)
 {
 #ifdef HAVE_GTK3
   GdkRGBA bg;
@@ -1439,7 +1439,7 @@
    BG is the pixel value to change to.  */
 
 void
-xg_set_background_color (struct frame *f, long unsigned int bg)
+xg_set_background_color (struct frame *f, unsigned long bg)
 {
   if (FRAME_GTK_WIDGET (f))
     {

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2013-10-17 06:42:21 +0000
+++ b/src/lisp.h        2013-10-29 16:08:08 +0000
@@ -71,7 +71,7 @@
 #  define pI "ll"
 # elif INT_MAX < LONG_MAX
 typedef long int EMACS_INT;
-typedef unsigned long int EMACS_UINT;
+typedef unsigned long EMACS_UINT;
 #  define EMACS_INT_MAX LONG_MAX
 #  define pI "l"
 # else

=== modified file 'src/regex.h'
--- a/src/regex.h       2013-07-10 23:23:57 +0000
+++ b/src/regex.h       2013-10-29 16:08:08 +0000
@@ -40,7 +40,7 @@
    The bits are given in alphabetical order, and
    the definitions shifted by one from the previous bit; thus, when we
    add or remove a bit, only one other definition need change.  */
-typedef unsigned long int reg_syntax_t;
+typedef unsigned long reg_syntax_t;
 
 /* If this bit is not set, then \ inside a bracket expression is literal.
    If set, then such a \ quotes the following character.  */

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2013-10-29 05:55:25 +0000
+++ b/src/xfaces.c      2013-10-29 16:08:08 +0000
@@ -535,7 +535,7 @@
    is called.  */
 
 void
-x_free_colors (struct frame *f, long unsigned int *pixels, int npixels)
+x_free_colors (struct frame *f, unsigned long *pixels, int npixels)
 {
   int class = FRAME_DISPLAY_INFO (f)->visual->class;
 
@@ -560,7 +560,7 @@
 
 void
 x_free_dpy_colors (Display *dpy, Screen *screen, Colormap cmap,
-                  long unsigned int *pixels, int npixels)
+                  unsigned long *pixels, int npixels)
 {
   struct x_display_info *dpyinfo = x_display_info_for_display (dpy);
   int class = dpyinfo->visual->class;
@@ -581,7 +581,7 @@
    are given by XGCV and MASK.  */
 
 static GC
-x_create_gc (struct frame *f, long unsigned int mask, XGCValues *xgcv)
+x_create_gc (struct frame *f, unsigned long mask, XGCValues *xgcv)
 {
   GC gc;
   block_input ();
@@ -1298,7 +1298,7 @@
 /* Free color PIXEL on frame F.  */
 
 void
-unload_color (struct frame *f, long unsigned int pixel)
+unload_color (struct frame *f, unsigned long pixel)
 {
   if (pixel != -1)
     {

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2013-10-10 10:06:17 +0000
+++ b/src/xselect.c     2013-10-29 16:08:08 +0000
@@ -2365,7 +2365,7 @@
 
 Lisp_Object
 x_property_data_to_lisp (struct frame *f, const unsigned char *data,
-                        Atom type, int format, long unsigned int size)
+                        Atom type, int format, unsigned long size)
 {
   ptrdiff_t format_bytes = format >> 3;
   if (PTRDIFF_MAX / format_bytes < size)

=== modified file 'src/xsettings.c'
--- a/src/xsettings.c   2013-10-04 07:36:22 +0000
+++ b/src/xsettings.c   2013-10-29 16:08:08 +0000
@@ -393,7 +393,7 @@
 
 static int
 parse_settings (unsigned char *prop,
-                long unsigned int bytes,
+                unsigned long bytes,
                 struct xsettings *settings)
 {
   Lisp_Object byteorder = Fbyteorder ();

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-10-29 05:55:25 +0000
+++ b/src/xterm.c       2013-10-29 16:08:08 +0000
@@ -1643,7 +1643,7 @@
    get color reference counts right.  */
 
 unsigned long
-x_copy_color (struct frame *f, long unsigned int pixel)
+x_copy_color (struct frame *f, unsigned long pixel)
 {
   XColor color;
 
@@ -1681,7 +1681,8 @@
    Value is non-zero if successful.  */
 
 static bool
-x_alloc_lighter_color (struct frame *f, Display *display, Colormap cmap, long 
unsigned int *pixel, double factor, int delta)
+x_alloc_lighter_color (struct frame *f, Display *display, Colormap cmap,
+                      unsigned long *pixel, double factor, int delta)
 {
   XColor color, new;
   long bright;
@@ -1757,7 +1758,8 @@
    be allocated, use DEFAULT_PIXEL, instead.  */
 
 static void
-x_setup_relief_color (struct frame *f, struct relief *relief, double factor, 
int delta, long unsigned int default_pixel)
+x_setup_relief_color (struct frame *f, struct relief *relief, double factor,
+                     int delta, unsigned long default_pixel)
 {
   XGCValues xgcv;
   struct x_output *di = f->output_data.x;
@@ -9686,7 +9688,7 @@
    get to the first bit.  With MASK 0x7e0, *BITS is set to 6, and *OFFSET
    to 5.  */
 static void
-get_bits_and_offset (long unsigned int mask, int *bits, int *offset)
+get_bits_and_offset (unsigned long mask, int *bits, int *offset)
 {
   int nr = 0;
   int off = 0;