emacs: src/w32fns.c comparison

comparison src/w32fns.c @ 40656:cdfd4d09b79a

Update usage of CHECK_ macros (remove unused second argument).

author	Pavel Janík <Pavel@Janik.cz>
date	Fri, 02 Nov 2001 20:46:55 +0000
parents	7fb50bbb61ad
children	f288d1d604a7

comparison

equal deleted inserted replaced

-:45453187feeb
+:cdfd4d09b79a
 {
 FRAME_PTR f;
 if (NILP (frame))
 frame = selected_frame;
-CHECK_LIVE_FRAME (frame, 0);
+CHECK_LIVE_FRAME (frame);
 f = XFRAME (frame);
 if (! FRAME_W32_P (f))
 error ("non-w32 frame used");
 return f;
 }
 return x_display_info_for_name (frame);
 else
 {
 FRAME_PTR f;
-CHECK_LIVE_FRAME (frame, 0);
+CHECK_LIVE_FRAME (frame);
 f = XFRAME (frame);
 if (! FRAME_W32_P (f))
 	error ("non-w32 frame used");
 return FRAME_W32_DISPLAY_INFO (f);
 }
 {
 Lisp_Object rgb;
 Lisp_Object oldrgb = Qnil;
 Lisp_Object entry;
-CHECK_NUMBER (red, 0);
+CHECK_NUMBER (red);
-CHECK_NUMBER (green, 0);
+CHECK_NUMBER (green);
-CHECK_NUMBER (blue, 0);
+CHECK_NUMBER (blue);
-CHECK_STRING (name, 0);
+CHECK_STRING (name);
 XSET (rgb, Lisp_Int, RGB(XUINT (red), XUINT (green), XUINT (blue)));
 BLOCK_INPUT;
 {
 FILE *fp;
 Lisp_Object cmap = Qnil;
 Lisp_Object abspath;
-CHECK_STRING (filename, 0);
+CHECK_STRING (filename);
 abspath = Fexpand_file_name (filename, Qnil);
 fp = fopen (XSTRING (filename)->data, "rt");
 if (fp)
 {
 w32_to_x_color (rgb)
 Lisp_Object rgb;
 {
 Lisp_Object color;
-CHECK_NUMBER (rgb, 0);
+CHECK_NUMBER (rgb);
 BLOCK_INPUT;
 color = Frassq (rgb, Vw32_color_map);
 Lisp_Object arg;
 int def;
 {
 XColor cdef;
-CHECK_STRING (arg, 0);
+CHECK_STRING (arg);
 if (strcmp (XSTRING (arg)->data, "black") == 0)
 return BLACK_PIX_DEFAULT (f);
 else if (strcmp (XSTRING (arg)->data, "white") == 0)
 return WHITE_PIX_DEFAULT (f);
 /* It's not okay to crash if the user selects a screwy cursor.  */
 count = x_catch_errors (FRAME_W32_DISPLAY (f));
 if (!EQ (Qnil, Vx_pointer_shape))
 {
-CHECK_NUMBER (Vx_pointer_shape, 0);
+CHECK_NUMBER (Vx_pointer_shape);
 cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XINT (Vx_pointer_shape));
 }
 else
 cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_xterm);
 x_check_errors (FRAME_W32_DISPLAY (f), "bad text pointer cursor: %s");
 if (!EQ (Qnil, Vx_nontext_pointer_shape))
 {
-CHECK_NUMBER (Vx_nontext_pointer_shape, 0);
+CHECK_NUMBER (Vx_nontext_pointer_shape);
 nontext_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),
 					  XINT (Vx_nontext_pointer_shape));
 }
 else
 nontext_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_left_ptr);
 x_check_errors (FRAME_W32_DISPLAY (f), "bad nontext pointer cursor: %s");
 if (!EQ (Qnil, Vx_hourglass_pointer_shape))
 {
-CHECK_NUMBER (Vx_hourglass_pointer_shape, 0);
+CHECK_NUMBER (Vx_hourglass_pointer_shape);
 hourglass_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),
 					    XINT (Vx_hourglass_pointer_shape));
 }
 else
 hourglass_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_watch);
 x_check_errors (FRAME_W32_DISPLAY (f), "bad busy pointer cursor: %s");
 x_check_errors (FRAME_W32_DISPLAY (f), "bad nontext pointer cursor: %s");
 if (!EQ (Qnil, Vx_mode_pointer_shape))
 {
-CHECK_NUMBER (Vx_mode_pointer_shape, 0);
+CHECK_NUMBER (Vx_mode_pointer_shape);
 mode_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),
 				       XINT (Vx_mode_pointer_shape));
 }
 else
 mode_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_xterm);
 x_check_errors (FRAME_W32_DISPLAY (f), "bad modeline pointer cursor: %s");
 if (!EQ (Qnil, Vx_sensitive_text_pointer_shape))
 {
-CHECK_NUMBER (Vx_sensitive_text_pointer_shape, 0);
+CHECK_NUMBER (Vx_sensitive_text_pointer_shape);
 cross_cursor
 	= XCreateFontCursor (FRAME_W32_DISPLAY (f),
 			     XINT (Vx_sensitive_text_pointer_shape));
 }
 else
 cross_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_crosshair);
 if (!NILP (Vx_window_horizontal_drag_shape))
 {
-CHECK_NUMBER (Vx_window_horizontal_drag_shape, 0);
+CHECK_NUMBER (Vx_window_horizontal_drag_shape);
 horizontal_drag_cursor
 	= XCreateFontCursor (FRAME_X_DISPLAY (f),
 			     XINT (Vx_window_horizontal_drag_shape));
 }
 else
 struct frame *f;
 Lisp_Object arg, oldval;
 {
 int pix;
-CHECK_STRING (arg, 0);
+CHECK_STRING (arg);
 pix = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
 x_set_border_pixel (f, pix);
 update_face_from_frame_parameter (f, Qborder_color, arg);
 }
 Lisp_Object result;
 Lisp_Object fontset_name;
 Lisp_Object frame;
 int old_fontset = FRAME_FONTSET(f);
-CHECK_STRING (arg, 1);
+CHECK_STRING (arg);
 fontset_name = Fquery_fontset (arg, Qnil);
 BLOCK_INPUT;
 result = (STRINGP (fontset_name)
 void
 x_set_border_width (f, arg, oldval)
 struct frame *f;
 Lisp_Object arg, oldval;
 {
-CHECK_NUMBER (arg, 0);
+CHECK_NUMBER (arg);
 if (XINT (arg) == f->output_data.w32->border_width)
 return;
 if (FRAME_W32_WINDOW (f) != 0)
 struct frame *f;
 Lisp_Object arg, oldval;
 {
 int old = f->output_data.w32->internal_border_width;
-CHECK_NUMBER (arg, 0);
+CHECK_NUMBER (arg);
 f->output_data.w32->internal_border_width = XINT (arg);
 if (f->output_data.w32->internal_border_width < 0)
 f->output_data.w32->internal_border_width = 0;
 if (f->output_data.w32->internal_border_width == old)
 		   XSTRING (f->name)->data))
 	return;
 name = build_string (FRAME_W32_DISPLAY_INFO (f)->w32_id_name);
 }
 else
-CHECK_STRING (name, 0);
+CHECK_STRING (name);
 /* Don't change the name if it's already NAME.  */
 if (! NILP (Fstring_equal (name, f->name)))
 return;
 {
 register char *value;
 char *name_key;
 char *class_key;
-CHECK_STRING (attribute, 0);
+CHECK_STRING (attribute);
-CHECK_STRING (class, 0);
+CHECK_STRING (class);
 if (!NILP (component))
-CHECK_STRING (component, 1);
+CHECK_STRING (component);
 if (!NILP (subclass))
-CHECK_STRING (subclass, 2);
+CHECK_STRING (subclass);
 if (NILP (component) != NILP (subclass))
 error ("x-get-resource: must specify both COMPONENT and SUBCLASS or neither");
 validate_x_resource_name ();
 {
 int geometry, x, y;
 unsigned int width, height;
 Lisp_Object result;
-CHECK_STRING (string, 0);
+CHECK_STRING (string);
 geometry = XParseGeometry ((char *) XSTRING (string)->data,
 			     &x, &y, &width, &height);
 result = Qnil;
 tem2 = w32_get_arg (parms, Quser_size, 0, 0, RES_TYPE_NUMBER);
 if (! EQ (tem0, Qunbound) || ! EQ (tem1, Qunbound))
 {
 if (!EQ (tem0, Qunbound))
 	{
-	  CHECK_NUMBER (tem0, 0);
+	  CHECK_NUMBER (tem0);
 	  f->height = XINT (tem0);
 	}
 if (!EQ (tem1, Qunbound))
 	{
-	  CHECK_NUMBER (tem1, 0);
+	  CHECK_NUMBER (tem1);
 	  SET_FRAME_WIDTH (f, XINT (tem1));
 	}
 if (!NILP (tem2) && !EQ (tem2, Qunbound))
 	window_prompting |= USSize;
 else
 	}
 else if (EQ (tem0, Qunbound))
 	f->output_data.w32->top_pos = 0;
 else
 	{
-	  CHECK_NUMBER (tem0, 0);
+	  CHECK_NUMBER (tem0);
 	  f->output_data.w32->top_pos = XINT (tem0);
 	  if (f->output_data.w32->top_pos < 0)
 	    window_prompting |= YNegative;
 	}
 	}
 else if (EQ (tem1, Qunbound))
 	f->output_data.w32->left_pos = 0;
 else
 	{
-	  CHECK_NUMBER (tem1, 0);
+	  CHECK_NUMBER (tem1);
 	  f->output_data.w32->left_pos = XINT (tem1);
 	  if (f->output_data.w32->left_pos < 0)
 	    window_prompting |= XNegative;
 	}
 icons in the tray.  */
 icon_x = w32_get_arg (parms, Qicon_left, 0, 0, RES_TYPE_NUMBER);
 icon_y = w32_get_arg (parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);
 if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
 {
-CHECK_NUMBER (icon_x, 0);
+CHECK_NUMBER (icon_x);
-CHECK_NUMBER (icon_y, 0);
+CHECK_NUMBER (icon_y);
 }
 else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))
 error ("Both left and top icon corners of icon must be specified");
 BLOCK_INPUT;
 /* See if parent window is specified.  */
 parent = w32_get_arg (parms, Qparent_id, NULL, NULL, RES_TYPE_NUMBER);
 if (EQ (parent, Qunbound))
 parent = Qnil;
 if (! NILP (parent))
-CHECK_NUMBER (parent, 0);
+CHECK_NUMBER (parent);
 /* make_frame_without_minibuffer can run Lisp code and garbage collect.  */
 /* No need to protect DISPLAY because that's not used after passing
 it to make_frame_without_minibuffer.  */
 frame = Qnil;
 Lisp_Object color, frame;
 {
 XColor foo;
 FRAME_PTR f = check_x_frame (frame);
-CHECK_STRING (color, 1);
+CHECK_STRING (color);
 if (w32_defined_color (f, XSTRING (color)->data, &foo, 0))
 return Qt;
 else
 return Qnil;
 Lisp_Object color, frame;
 {
 XColor foo;
 FRAME_PTR f = check_x_frame (frame);
-CHECK_STRING (color, 1);
+CHECK_STRING (color);
 if (w32_defined_color (f, XSTRING (color)->data, &foo, 0))
 {
 Lisp_Object rgb[3];
 Lisp_Object name;
 {
 Lisp_Object names;
 struct w32_display_info *dpyinfo;
-CHECK_STRING (name, 0);
+CHECK_STRING (name);
 for (dpyinfo = &one_w32_display_info, names = w32_display_name_list;
 dpyinfo;
 dpyinfo = dpyinfo->next, names = XCDR (names))
 {
 Lisp_Object display, xrm_string, must_succeed;
 {
 unsigned char *xrm_option;
 struct w32_display_info *dpyinfo;
-CHECK_STRING (display, 0);
+CHECK_STRING (display);
 if (! NILP (xrm_string))
-CHECK_STRING (xrm_string, 1);
+CHECK_STRING (xrm_string);
 if (! EQ (Vwindow_system, intern ("w32")))
 error ("Not using Microsoft Windows");
 /* Allow color mapping to be defined externally; first look in user's
 {
 #if 0 /* TODO : port window properties to W32 */
 struct frame *f = check_x_frame (frame);
 Atom prop_atom;
-CHECK_STRING (prop, 1);
+CHECK_STRING (prop);
-CHECK_STRING (value, 2);
+CHECK_STRING (value);
 BLOCK_INPUT;
 prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);
 XChangeProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f),
 		   prop_atom, XA_STRING, 8, PropModeReplace,
 #if 0 /* TODO : port window properties to W32 */
 struct frame *f = check_x_frame (frame);
 Atom prop_atom;
-CHECK_STRING (prop, 1);
+CHECK_STRING (prop);
 BLOCK_INPUT;
 prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);
 XDeleteProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), prop_atom);
 /* Make sure the property is removed when we return.  */
 char *tmp_data = NULL;
 Atom actual_type;
 int actual_format;
 unsigned long actual_size, bytes_remaining;
-CHECK_STRING (prop, 1);
+CHECK_STRING (prop);
 BLOCK_INPUT;
 prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);
 rc = XGetWindowProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f),
 			   prop_atom, 0, 0, False, XA_STRING,
 			   &actual_type, &actual_format, &actual_size,
 specbind (Qinhibit_redisplay, Qt);
 GCPRO4 (string, parms, frame, timeout);
-CHECK_STRING (string, 0);
+CHECK_STRING (string);
 f = check_x_frame (frame);
 if (NILP (timeout))
 timeout = make_number (5);
 else
-CHECK_NATNUM (timeout, 2);
+CHECK_NATNUM (timeout);
 if (NILP (dx))
 dx = make_number (5);
 else
-CHECK_NUMBER (dx, 5);
+CHECK_NUMBER (dx);
 if (NILP (dy))
 dy = make_number (-10);
 else
-CHECK_NUMBER (dy, 6);
+CHECK_NUMBER (dy);
 if (NILP (last_show_tip_args))
 last_show_tip_args = Fmake_vector (make_number (3), Qnil);
 if (!NILP (tip_frame))
 char filename[MAX_PATH + 1];
 char init_dir[MAX_PATH + 1];
 int use_dialog_p = 1;
 GCPRO5 (prompt, dir, default_filename, mustmatch, file);
-CHECK_STRING (prompt, 0);
+CHECK_STRING (prompt);
-CHECK_STRING (dir, 1);
+CHECK_STRING (dir);
 /* Create the dialog with PROMPT as title, using DIR as initial
 directory and using "*" as pattern.  */
 dir = Fexpand_file_name (dir, Qnil);
 strncpy (init_dir, XSTRING (dir)->data, MAX_PATH);
 (command, frame)
 Lisp_Object command, frame;
 {
 FRAME_PTR f = check_x_frame (frame);
-CHECK_NUMBER (command, 0);
+CHECK_NUMBER (command);
 PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, XINT (command), 0);
 return Qnil;
 }
 (operation, document, parameters, show_flag)
 Lisp_Object operation, document, parameters, show_flag;
 {
 Lisp_Object current_dir;
-CHECK_STRING (document, 0);
+CHECK_STRING (document);
 /* Encode filename and current directory.  */
 current_dir = ENCODE_FILE (current_buffer->directory);
 document = ENCODE_FILE (document);
 if ((int) ShellExecute (NULL,
 int vk_code;
 int lisp_modifiers;
 int w32_modifiers;
 struct gcpro gcpro1;
-CHECK_VECTOR (key, 0);
+CHECK_VECTOR (key);
 if (XFASTINT (Flength (key)) != 1)
 return Qnil;
 GCPRO1 (key);
 Lisp_Object hotkeyid;
 {
 int vk_code, w32_modifiers;
 Lisp_Object key;
-CHECK_NUMBER (hotkeyid, 0);
+CHECK_NUMBER (hotkeyid);
 vk_code = HOTKEY_VK_CODE (hotkeyid);
 w32_modifiers = HOTKEY_MODIFIERS (hotkeyid);
 if (lispy_function_keys[vk_code])
 (filename)
 Lisp_Object filename;
 {
 Lisp_Object encoded, value;
-CHECK_STRING (filename, 0);
+CHECK_STRING (filename);
 filename = Fexpand_file_name (filename, Qnil);
 encoded = ENCODE_FILE (filename);
 value = Qnil;

Mercurial > emacs

comparison src/w32fns.c @ 40656:cdfd4d09b79a