comparison src/coding.c @ 111997:a5a188ddc758

Minor clean up to silence some gcc warnings. * src/window.c (Fset_window_buffer): * src/xterm.c (x_set_frame_alpha): Restructure code to silence compiler warning. (handle_one_xevent): Remove unused var `p'. (do_ewmh_fullscreen): Remove unused var `lval'. (xembed_set_info): Remove unused var `atom'. * src/textprop.c (Fremove_list_of_text_properties): Add braces to silence compiler warning. * src/fontset.c (fontset_id_valid_p, dump_fontset): * src/ftfont.c (ftfont_drive_otf): Modernize k&r declaration. * src/eval.c (Feval, Ffuncall): Avoid unneeded gotos. * src/dispnew.c (update_frame, update_frame_1): Compile the `do_pause' label only when it's used. * src/image.c (x_create_bitmap_from_xpm_data): * src/dispextern.h (x_create_bitmap_from_xpm_data): Use const char** like its callers. * src/coding.c (detect_coding_utf_16): Remove unused vars `src_base' and `consumed_chars'. (DECODE_EMACS_MULE_21_COMPOSITION): Remove unused var `charbuf_base'. (decode_coding_emacs_mule): Remove unused label `retry'. (detect_eol): Add parens to silence compiler warning. * src/alloc.c (bytes_used_when_reconsidered): Move to the #ifdef where it's used to silence the compiler. (make_number): Modernize k&r declaration. (mark_char_table): Add parens to silence compiler warning.

111996:90a2d870e83e

static int
detect_coding_utf_16 (struct coding_system *coding,
		      struct coding_detection_info *detect_info)
{
  const unsigned char *src = coding->source, *src_base = src;
  const unsigned char *src_end = coding->source + coding->src_bytes;
  int multibytep = coding->src_multibyte;
  int consumed_chars = 0;
  int c1, c2;

  detect_info->checked |= CATEGORY_MASK_UTF_16;
  if (coding->mode & CODING_MODE_LAST_BLOCK
      && (coding->src_chars & 1))

   characters composed by this composition.  */

#define DECODE_EMACS_MULE_21_COMPOSITION()				\
  do {									\
    enum composition_method method = c - 0xF2;				\
    int *charbuf_base = charbuf;					\
    int nbytes, nchars;							\
    									\
    ONE_MORE_BYTE (c);							\
    if (c < 0)								\
      goto invalid_code;						\

	  else
	    EMACS_MULE_MAYBE_FINISH_COMPOSITION ();
	}
      continue;

    retry:
      src = src_base;
      consumed_chars = consumed_chars_base;
      continue;

    invalid_code:

		eol_seen = this_eol;
	      else if (eol_seen != this_eol)
		{
		  /* The found type is different from what found before.
		     Allow for stray ^M characters in DOS EOL files.  */
		  if (eol_seen == EOL_SEEN_CR && this_eol == EOL_SEEN_CRLF
		      || eol_seen == EOL_SEEN_CRLF && this_eol == EOL_SEEN_CR)
		    eol_seen = EOL_SEEN_CRLF;
		  else
		    {
		      eol_seen = EOL_SEEN_LF;
		      break;

	    }
	  src += 2;
	}
    }
  else
    {
      while (src < src_end)
	{
	  c = *src++;
	  if (c == '\n' || c == '\r')
	    {
	      int this_eol;

	      if (c == '\n')
		this_eol = EOL_SEEN_LF;
	      else if (src >= src_end || *src != '\n')
		this_eol = EOL_SEEN_CR;
	      else
		this_eol = EOL_SEEN_CRLF, src++;

	      if (eol_seen == EOL_SEEN_NONE)
		/* This is the first end-of-line.  */
		eol_seen = this_eol;
	      else if (eol_seen != this_eol)
		{
		  /* The found type is different from what found before.
		     Allow for stray ^M characters in DOS EOL files.  */
		  if (eol_seen == EOL_SEEN_CR && this_eol == EOL_SEEN_CRLF
		      || eol_seen == EOL_SEEN_CRLF && this_eol == EOL_SEEN_CR)
		    eol_seen = EOL_SEEN_CRLF;
		  else
		    {
		      eol_seen = EOL_SEEN_LF;
		      break;
		    }
		}
	      if (++total == MAX_EOL_CHECK_COUNT)
		break;
	    }
	}
    }
  return eol_seen;
}


static Lisp_Object

111997:a5a188ddc758

static int
detect_coding_utf_16 (struct coding_system *coding,
		      struct coding_detection_info *detect_info)
{
  const unsigned char *src = coding->source;
  const unsigned char *src_end = coding->source + coding->src_bytes;
  int multibytep = coding->src_multibyte;
  int c1, c2;

  detect_info->checked |= CATEGORY_MASK_UTF_16;
  if (coding->mode & CODING_MODE_LAST_BLOCK
      && (coding->src_chars & 1))

   characters composed by this composition.  */

#define DECODE_EMACS_MULE_21_COMPOSITION()				\
  do {									\
    enum composition_method method = c - 0xF2;				\
    int nbytes, nchars;							\
    									\
    ONE_MORE_BYTE (c);							\
    if (c < 0)								\
      goto invalid_code;						\

	  else
	    EMACS_MULE_MAYBE_FINISH_COMPOSITION ();
	}
      continue;

      src = src_base;
      consumed_chars = consumed_chars_base;
      continue;

    invalid_code:

		eol_seen = this_eol;
	      else if (eol_seen != this_eol)
		{
		  /* The found type is different from what found before.
		     Allow for stray ^M characters in DOS EOL files.  */
		  if ((eol_seen == EOL_SEEN_CR && this_eol == EOL_SEEN_CRLF)
		      || (eol_seen == EOL_SEEN_CRLF
			  && this_eol == EOL_SEEN_CR))
		    eol_seen = EOL_SEEN_CRLF;
		  else
		    {
		      eol_seen = EOL_SEEN_LF;
		      break;

	    }
	  src += 2;
	}
    }
  else
    while (src < src_end)
      {
	c = *src++;
	if (c == '\n' || c == '\r')
	  {
	    int this_eol;

	    if (c == '\n')
	      this_eol = EOL_SEEN_LF;
	    else if (src >= src_end || *src != '\n')
	      this_eol = EOL_SEEN_CR;
	    else
	      this_eol = EOL_SEEN_CRLF, src++;

	    if (eol_seen == EOL_SEEN_NONE)
	      /* This is the first end-of-line.  */
	      eol_seen = this_eol;
	    else if (eol_seen != this_eol)
	      {
		/* The found type is different from what found before.
		   Allow for stray ^M characters in DOS EOL files.  */
		if ((eol_seen == EOL_SEEN_CR && this_eol == EOL_SEEN_CRLF)
		    || (eol_seen == EOL_SEEN_CRLF && this_eol == EOL_SEEN_CR))
		  eol_seen = EOL_SEEN_CRLF;
		else
		  {
		    eol_seen = EOL_SEEN_LF;
		    break;
		  }
	      }
	    if (++total == MAX_EOL_CHECK_COUNT)
	      break;
	  }
      }
  return eol_seen;
}


static Lisp_Object