summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-03-23 01:06:21 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-03-23 01:06:21 -0700
commit12ea59a297551086de418573f6ee201fc3ef2768 (patch)
tree61f9745913698efb9cc12b956e27f09e2f69b261
parent6ad6792b390fd7d45773a5c14e29d44a54c17f1e (diff)
downloademacs-12ea59a297551086de418573f6ee201fc3ef2768.tar.gz
emacs-12ea59a297551086de418573f6ee201fc3ef2768.tar.bz2
emacs-12ea59a297551086de418573f6ee201fc3ef2768.zip
* cm.c (calccost): Turn while-do into do-while, for clarity.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/cm.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4994aaa9fa8..1d3d4d65174 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
2011-03-23 Paul Eggert <eggert@cs.ucla.edu>
+ * cm.c (calccost): Turn while-do into do-while, for clarity.
+
Fix more problems found by GCC 4.5.2's static checks.
* coding.c (encode_coding_raw_text): Avoid unnecessary test
diff --git a/src/cm.c b/src/cm.c
index 6379955b48c..42f855f1694 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -214,8 +214,9 @@ calccost (struct tty_display_info *tty,
}
totalcost = c * deltay;
if (doit)
- while (--deltay >= 0)
+ do
emacs_tputs (tty, p, 1, cmputc);
+ while (0 < --deltay);
x:
if ((deltax = dstx - srcx) == 0)
goto done;
@@ -296,8 +297,9 @@ fail:
}
totalcost += c * deltax;
if (doit)
- while (--deltax >= 0)
+ do
emacs_tputs (tty, p, 1, cmputc);
+ while (0 < --deltax);
done:
return totalcost;
}