vim: src/spell.c comparison

comparison src/spell.c @ 1753:5098908178cd v7.2.050

updated for version 7.2-050

author	vimboss
date	Fri, 28 Nov 2008 09:08:51 +0000
parents	5b43a3a9454a
children	f10fe14748e2

comparison

equal deleted inserted replaced

-:a8aae2e1d2ae
+:5098908178cd
 garray_T	*gap;
 fromto_T	*ftp;
 char_u	*p;
 int		rr;
 int		retval = OK;
+int		fwv = 1;  /* collect return value of fwrite() to avoid
+			     warnings from picky compiler */
 fd = mch_fopen((char *)fname, "w");
 if (fd == NULL)
 {
 	EMSG2(_(e_notopen), fname);
 	return FAIL;
 }
 /* <HEADER>: <fileID> <versionnr> */
 							    /* <fileID> */
-if (fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd) != 1)
+fwv &= fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd);
-{
-	EMSG(_(e_write));
-	retval = FAIL;
-}
 putc(VIMSPELLVERSION, fd);				    /* <versionnr> */
 /*
 * <SECTIONS>: <section> ... <sectionend>
 */
 	putc(SN_INFO, fd);				/* <sectionID> */
 	putc(0, fd);					/* <sectionflags> */
 	i = (int)STRLEN(spin->si_info);
 	put_bytes(fd, (long_u)i, 4);			/* <sectionlen> */
-	fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
+	fwv &= fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
 }
 /* SN_REGION: <regionname> ...
 * Write the region names only if there is more than one. */
 if (spin->si_region_count > 1)
 {
 	putc(SN_REGION, fd);				/* <sectionID> */
 	putc(SNF_REQUIRED, fd);				/* <sectionflags> */
 	l = spin->si_region_count * 2;
 	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
-	fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
+	fwv &= fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
 							/* <regionname> ... */
 	regionmask = (1 << spin->si_region_count) - 1;
 }
 else
 	regionmask = 0;
 		flags |= CF_UPPER;
 	    fputc(flags, fd);				/* <charflags> */
 	}
 	put_bytes(fd, (long_u)l, 2);			/* <folcharslen> */
-	fwrite(folchars, (size_t)l, (size_t)1, fd);	/* <folchars> */
+	fwv &= fwrite(folchars, (size_t)l, (size_t)1, fd); /* <folchars> */
 }
 /* SN_MIDWORD: <midword> */
 if (spin->si_midword != NULL)
 {
 	putc(SN_MIDWORD, fd);				/* <sectionID> */
 	putc(SNF_REQUIRED, fd);				/* <sectionflags> */
 	i = (int)STRLEN(spin->si_midword);
 	put_bytes(fd, (long_u)i, 4);			/* <sectionlen> */
-	fwrite(spin->si_midword, (size_t)i, (size_t)1, fd); /* <midword> */
+	fwv &= fwrite(spin->si_midword, (size_t)i, (size_t)1, fd);
+							/* <midword> */
 }
 /* SN_PREFCOND: <prefcondcnt> <prefcond> ... */
 if (spin->si_prefcond.ga_len > 0)
 {
 	    for (rr = 1; rr <= 2; ++rr)
 	    {
 		p = rr == 1 ? ftp->ft_from : ftp->ft_to;
 		l = (int)STRLEN(p);
 		putc(l, fd);
-		fwrite(p, l, (size_t)1, fd);
+		fwv &= fwrite(p, l, (size_t)1, fd);
 	    }
 	}
 }
 	l = (int)STRLEN(spin->si_sofofr);
 	put_bytes(fd, (long_u)(l + STRLEN(spin->si_sofoto) + 4), 4);
 							/* <sectionlen> */
 	put_bytes(fd, (long_u)l, 2);			/* <sofofromlen> */
-	fwrite(spin->si_sofofr, l, (size_t)1, fd);	/* <sofofrom> */
+	fwv &= fwrite(spin->si_sofofr, l, (size_t)1, fd); /* <sofofrom> */
 	l = (int)STRLEN(spin->si_sofoto);
 	put_bytes(fd, (long_u)l, 2);			/* <sofotolen> */
-	fwrite(spin->si_sofoto, l, (size_t)1, fd);	/* <sofoto> */
+	fwv &= fwrite(spin->si_sofoto, l, (size_t)1, fd); /* <sofoto> */
 }
 /* SN_WORDS: <word> ...
 * This is for making suggestions, section is not required. */
 if (spin->si_commonwords.ht_used > 0)
 		if (!HASHITEM_EMPTY(hi))
 		{
 		    l = (int)STRLEN(hi->hi_key) + 1;
 		    len += l;
 		    if (round == 2)			/* <word> */
-			fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
+			fwv &= fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
 		    --todo;
 		}
 	    if (round == 1)
 		put_bytes(fd, (long_u)len, 4);		/* <sectionlen> */
 	}
 {
 	putc(SN_MAP, fd);				/* <sectionID> */
 	putc(0, fd);					/* <sectionflags> */
 	l = spin->si_map.ga_len;
 	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
-	fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
+	fwv &= fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
 							/* <mapstr> */
 }
 /* SN_SUGFILE: <timestamp>
 * This is used to notify that a .sug file may be available and at the
 							/* <comppatcount> */
 	for (i = 0; i < spin->si_comppat.ga_len; ++i)
 	{
 	    p = ((char_u **)(spin->si_comppat.ga_data))[i];
 	    putc((int)STRLEN(p), fd);			/* <comppatlen> */
-	    fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);/* <comppattext> */
+	    fwv &= fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);
+							/* <comppattext> */
 	}
 							/* <compflags> */
-	fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
+	fwv &= fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
 							       (size_t)1, fd);
 }
 /* SN_NOBREAK: NOBREAK flag */
 if (spin->si_nobreak)
 	putc(SN_SYLLABLE, fd);				/* <sectionID> */
 	putc(0, fd);					/* <sectionflags> */
 	l = (int)STRLEN(spin->si_syllable);
 	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
-	fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd); /* <syllable> */
+	fwv &= fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd);
+							/* <syllable> */
 }
 /* end of <SECTIONS> */
 putc(SN_END, fd);					/* <sectionend> */
 	/* Write the nodes. */
 	(void)put_node(fd, tree, 0, regionmask, round == 3);
 }
-/* Write another byte to check for errors. */
+/* Write another byte to check for errors (file system full). */
 if (putc(0, fd) == EOF)
 	retval = FAIL;
 if (fclose(fd) == EOF)
 	retval = FAIL;
+if (fwv != 1)
+	retval = FAIL;
+if (retval == FAIL)
+	EMSG(_(e_write));
 return retval;
 }
 /*
 {
 int		i;
 char_u	*p;
 int		len;
 int		totlen;
+int		x = 1;  /* collect return value of fwrite() */
 if (fd != NULL)
 	put_bytes(fd, (long_u)gap->ga_len, 2);	    /* <prefcondcnt> */
 totlen = 2 + gap->ga_len; /* length of <prefcondcnt> and <condlen> bytes */
 	{
 	    len = (int)STRLEN(p);
 	    if (fd != NULL)
 	    {
 		fputc(len, fd);
-		fwrite(p, (size_t)len, (size_t)1, fd);
+		x &= fwrite(p, (size_t)len, (size_t)1, fd);
 	    }
 	    totlen += len;
 	}
 	else if (fd != NULL)
 	    fputc(0, fd);

Mercurial > vim

comparison src/spell.c @ 1753:5098908178cd v7.2.050