comparison src/fns.c @ 49915:95557d4395b0

(string_to_multibyte): Remove unused var i. (Flanginfo): Fix int/Lisp_Object mixup. (void_call2): New fun. (Fmap_char_table): Use it in place of call2.

49914:b4b6ede28a6f

string_to_multibyte (string)
     Lisp_Object string;
{
  unsigned char *buf;
  int nbytes;
  int i;

  if (STRING_MULTIBYTE (string))
    return string;

  nbytes = parse_str_to_multibyte (SDATA (string), SBYTES (string));

	    call2 (function, make_number (c), elt);
  	}
    }
}

DEFUN ("map-char-table", Fmap_char_table, Smap_char_table,
       2, 2, 0,
       doc: /* Call FUNCTION for each (normal and generic) characters in CHAR-TABLE.
FUNCTION is called with two arguments--a key and a value.
The key is always a possible IDX argument to `aref'.  */)

  /* The depth of char table is at most 3. */
  Lisp_Object indices[3];

  CHECK_CHAR_TABLE (char_table);

  map_char_table ((POINTER_TYPE *) call2, Qnil, char_table, function, 0, indices);
  return Qnil;
}

/* Return a value for character C in char-table TABLE.  Store the
   actual index for that value in *IDX.  Ignore the default value of

	  val = make_unibyte_string (str, strlen (str));
	  /* Fixme: Is this coding system necessarily right, even if
	     it is consistent with CODESET?  If not, what to do?  */
	  Faset (v, make_number (i),
		 code_convert_string_norecord (val, Vlocale_coding_system,
					       Qnil));
	}
      return v;
    }
#endif	/* DAY_1 */
#ifdef MON_1

      for (i = 0; i < 12; i++)
	{
	  str = nl_langinfo (months[i]);
	  val = make_unibyte_string (str, strlen (str));
	  p->contents[i] =
	    code_convert_string_norecord (val, Vlocale_coding_system, Qnil);
	}
      XSETVECTOR (val, p);
      return val;
    }
#endif	/* MON_1 */

49915:95557d4395b0

string_to_multibyte (string)
     Lisp_Object string;
{
  unsigned char *buf;
  int nbytes;

  if (STRING_MULTIBYTE (string))
    return string;

  nbytes = parse_str_to_multibyte (SDATA (string), SBYTES (string));

	    call2 (function, make_number (c), elt);
  	}
    }
}

static void void_call2 P_ ((Lisp_Object a, Lisp_Object b, Lisp_Object c));
static void
void_call2 (a, b, c)
     Lisp_Object a, b, c;
{
  call2 (a, b, c);
}

DEFUN ("map-char-table", Fmap_char_table, Smap_char_table,
       2, 2, 0,
       doc: /* Call FUNCTION for each (normal and generic) characters in CHAR-TABLE.
FUNCTION is called with two arguments--a key and a value.
The key is always a possible IDX argument to `aref'.  */)

  /* The depth of char table is at most 3. */
  Lisp_Object indices[3];

  CHECK_CHAR_TABLE (char_table);

  /* When Lisp_Object is represented as a union, `call2' cannot directly
     be passed to map_char_table because it returns a Lisp_Object rather
     than returning nothing.
     Casting leads to crashes on some architectures.  -stef  */
  map_char_table (void_call2, Qnil, char_table, function, 0, indices);
  return Qnil;
}

/* Return a value for character C in char-table TABLE.  Store the
   actual index for that value in *IDX.  Ignore the default value of

	  val = make_unibyte_string (str, strlen (str));
	  /* Fixme: Is this coding system necessarily right, even if
	     it is consistent with CODESET?  If not, what to do?  */
	  Faset (v, make_number (i),
		 code_convert_string_norecord (val, Vlocale_coding_system,
					       0));
	}
      return v;
    }
#endif	/* DAY_1 */
#ifdef MON_1

      for (i = 0; i < 12; i++)
	{
	  str = nl_langinfo (months[i]);
	  val = make_unibyte_string (str, strlen (str));
	  p->contents[i] =
	    code_convert_string_norecord (val, Vlocale_coding_system, 0);
	}
      XSETVECTOR (val, p);
      return val;
    }
#endif	/* MON_1 */