vim: src/spell.c comparison

comparison src/spell.c @ 695:653eeb31bad6

updated for version 7.0210

author	vimboss
date	Tue, 28 Feb 2006 23:50:17 +0000
parents	0e922220d322
children	e402b0af6083

comparison

equal deleted inserted replaced

-:07d199fe02ed
+:653eeb31bad6
 static void spell_load_lang __ARGS((char_u *lang));
 static char_u *spell_enc __ARGS((void));
 static void int_wordlist_spl __ARGS((char_u *fname));
 static void spell_load_cb __ARGS((char_u *fname, void *cookie));
 static slang_T *spell_load_file __ARGS((char_u *fname, char_u *lang, slang_T *old_lp, int silent));
+static int get2c __ARGS((FILE *fd));
+static int get3c __ARGS((FILE *fd));
+static int get4c __ARGS((FILE *fd));
+static time_t get8c __ARGS((FILE *fd));
 static char_u *read_cnt_string __ARGS((FILE *fd, int cnt_bytes, int *lenp));
 static char_u *read_string __ARGS((FILE *fd, int cnt));
 static int read_region_section __ARGS((FILE *fd, slang_T *slang, int len));
 static int read_charflags_section __ARGS((FILE *fd));
 static int read_prefcond_section __ARGS((FILE *fd, slang_T *lp));
 {
 	n = getc(fd);			    /* <sectionID> or <sectionend> */
 	if (n == SN_END)
 	    break;
 	c = getc(fd);					/* <sectionflags> */
-	len = (getc(fd) << 24) + (getc(fd) << 16) + (getc(fd) << 8) + getc(fd);
+	len = get4c(fd);				/* <sectionlen> */
-							/* <sectionlen> */
 	if (len < 0)
 	    goto truncerr;
 	res = 0;
 	switch (n)
 	    case SN_WORDS:
 		res = read_words_section(fd, lp, len);
 		break;
 	    case SN_SUGFILE:
-		for (i = 7; i >= 0; --i)		/* <timestamp> */
+		lp->sl_sugtime = get8c(fd);		/* <timestamp> */
-		    lp->sl_sugtime += getc(fd) << (i * 8);
 		break;
 	    case SN_COMPOUND:
 		res = read_compound(fd, lp, len);
 		break;
 return lp;
 }
 /*
+* Read 2 bytes from "fd" and turn them into an int, MSB first.
+*/
+static int
+get2c(fd)
+FILE	*fd;
+{
+long	n;
+n = getc(fd);
+n = (n << 8) + getc(fd);
+return n;
+}
+/*
+* Read 3 bytes from "fd" and turn them into an int, MSB first.
+*/
+static int
+get3c(fd)
+FILE	*fd;
+{
+long	n;
+n = getc(fd);
+n = (n << 8) + getc(fd);
+n = (n << 8) + getc(fd);
+return n;
+}
+/*
+* Read 4 bytes from "fd" and turn them into an int, MSB first.
+*/
+static int
+get4c(fd)
+FILE	*fd;
+{
+long	n;
+n = getc(fd);
+n = (n << 8) + getc(fd);
+n = (n << 8) + getc(fd);
+n = (n << 8) + getc(fd);
+return n;
+}
+/*
+* Read 8 bytes from "fd" and turn them into a time_t, MSB first.
+*/
+static time_t
+get8c(fd)
+FILE	*fd;
+{
+time_t	n = 0;
+int		i;
+for (i = 0; i < 8; ++i)
+	n = (n << 8) + getc(fd);
+return n;
+}
+/*
 * Read a length field from "fd" in "cnt_bytes" bytes.
 * Allocate memory, read the string into it and add a NUL at the end.
 * Returns NULL when the count is zero.
 * Sets "*cntp" to SP_*ERROR when there is an error, length of the result
 * otherwise.
 int		n;
 char_u	*p;
 char_u	buf[MAXWLEN + 1];
 /* <prefcondcnt> <prefcond> ... */
-cnt = (getc(fd) << 8) + getc(fd);			/* <prefcondcnt> */
+cnt = get2c(fd);					/* <prefcondcnt> */
 if (cnt <= 0)
 	return SP_FORMERROR;
 lp->sl_prefprog = (regprog_T **)alloc_clear(
 					 (unsigned)sizeof(regprog_T *) * cnt);
 {
 int		cnt;
 fromto_T	*ftp;
 int		i;
-cnt = (getc(fd) << 8) + getc(fd);			/* <repcount> */
+cnt = get2c(fd);					/* <repcount> */
 if (cnt < 0)
 	return SP_TRUNCERROR;
 if (ga_grow(gap, cnt) == FAIL)
 	return SP_OTHERERROR;
 if (i & SAL_COLLAPSE)
 	slang->sl_collapse = TRUE;
 if (i & SAL_REM_ACCENTS)
 	slang->sl_rem_accents = TRUE;
-cnt = (getc(fd) << 8) + getc(fd);		/* <salcount> */
+cnt = get2c(fd);				/* <salcount> */
 if (cnt < 0)
 	return SP_TRUNCERROR;
 gap = &slang->sl_sal;
 ga_init2(gap, sizeof(salitem_T), 10);
 char_u	*bp;
 idx_T	*ip;
 /* The tree size was computed when writing the file, so that we can
 * allocate it as one long block. <nodecount> */
-len = (getc(fd) << 24) + (getc(fd) << 16) + (getc(fd) << 8) + getc(fd);
+len = get4c(fd);
 if (len < 0)
 	return SP_TRUNCERROR;
 if (len > 0)
 {
 	/* Allocate the byte array. */
 		    else
 			c = 0;
 		    c |= getc(fd);			/* <affixID> */
-		    n = (getc(fd) << 8) + getc(fd);	/* <prefcondnr> */
+		    n = get2c(fd);			/* <prefcondnr> */
 		    if (n >= maxprefcondnr)
 			return SP_FORMERROR;
 		    c |= (n << 8);
 		}
 		else /* c must be BY_FLAGS or BY_FLAGS2 */
 		c = 0;
 	    }
 	    else /* c == BY_INDEX */
 	    {
 							/* <nodeidx> */
-		n = (getc(fd) << 16) + (getc(fd) << 8) + getc(fd);
+		n = get3c(fd);
 		if (n < 0 || n >= maxidx)
 		    return SP_FORMERROR;
 		idxs[idx] = n + SHARED_MASK;
 		c = getc(fd);				/* <xbyte> */
 	    }
 		goto nextone;
 	    }
 	    /* Check the timestamp, it must be exactly the same as the one in
 	     * the .spl file.  Otherwise the word numbers won't match. */
-	    timestamp = 0;
+	    timestamp = get8c(fd);			/* <timestamp> */
-	    for (i = 7; i >= 0; --i)		/* <timestamp> */
-		timestamp += getc(fd) << (i * 8);
 	    if (timestamp != slang->sl_sugtime)
 	    {
 		EMSG2(_("E781: .sug file doesn't match .spl file: %s"),
 							     slang->sl_fname);
 		goto nextone;
 	     */
 	    slang->sl_sugbuf = open_spellbuf();
 	    if (slang->sl_sugbuf == NULL)
 		goto someerror;
 							    /* <sugwcount> */
-	    wcount = (getc(fd) << 24) + (getc(fd) << 16) + (getc(fd) << 8)
+	    wcount = get4c(fd);
-								   + getc(fd);
 	    if (wcount < 0)
 		goto someerror;
 	    /* Read all the wordnr lists into the buffer, one NUL terminated
 	     * list per line. */

Mercurial > vim

comparison src/spell.c @ 695:653eeb31bad6