aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-09-11 12:51:13 +0000
committerGerd Moellmann2000-09-11 12:51:13 +0000
commit093386ca6c49893e3327dc49f94e64c1c9d09a26 (patch)
tree8eecffcc0617872ccd1d383903fd73016ed8d4a6 /src
parent974e1e5b2a31b2648a381d7a2bc5bf9a3204f401 (diff)
downloademacs-093386ca6c49893e3327dc49f94e64c1c9d09a26.tar.gz
emacs-093386ca6c49893e3327dc49f94e64c1c9d09a26.zip
(concat, Fsubstring, internal_equal, Fnconc): Avoid some
compiler warnings.
Diffstat (limited to 'src')
-rw-r--r--src/fns.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/fns.c b/src/fns.c
index 1f53ecb4a04..17b68f55050 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -554,7 +554,7 @@ concat (nargs, args, target_type, last_special)
554 register Lisp_Object tail; 554 register Lisp_Object tail;
555 register Lisp_Object this; 555 register Lisp_Object this;
556 int toindex; 556 int toindex;
557 int toindex_byte; 557 int toindex_byte = 0;
558 register int result_len; 558 register int result_len;
559 register int result_len_byte; 559 register int result_len_byte;
560 register int argnum; 560 register int argnum;
@@ -566,10 +566,12 @@ concat (nargs, args, target_type, last_special)
566 string can't be decided until we finish the whole concatination. 566 string can't be decided until we finish the whole concatination.
567 So, we record strings that have text properties to be copied 567 So, we record strings that have text properties to be copied
568 here, and copy the text properties after the concatination. */ 568 here, and copy the text properties after the concatination. */
569 struct textprop_rec *textprops; 569 struct textprop_rec *textprops = NULL;
570 /* Number of elments in textprops. */ 570 /* Number of elments in textprops. */
571 int num_textprops = 0; 571 int num_textprops = 0;
572 572
573 tail = Qnil;
574
573 /* In append, the last arg isn't treated like the others */ 575 /* In append, the last arg isn't treated like the others */
574 if (last_special && nargs > 0) 576 if (last_special && nargs > 0)
575 { 577 {
@@ -681,7 +683,7 @@ concat (nargs, args, target_type, last_special)
681 for (argnum = 0; argnum < nargs; argnum++) 683 for (argnum = 0; argnum < nargs; argnum++)
682 { 684 {
683 Lisp_Object thislen; 685 Lisp_Object thislen;
684 int thisleni; 686 int thisleni = 0;
685 register unsigned int thisindex = 0; 687 register unsigned int thisindex = 0;
686 register unsigned int thisindex_byte = 0; 688 register unsigned int thisindex_byte = 0;
687 689
@@ -1173,9 +1175,9 @@ This function allows vectors as well as strings.")
1173{ 1175{
1174 Lisp_Object res; 1176 Lisp_Object res;
1175 int size; 1177 int size;
1176 int size_byte; 1178 int size_byte = 0;
1177 int from_char, to_char; 1179 int from_char, to_char;
1178 int from_byte, to_byte; 1180 int from_byte = 0, to_byte = 0;
1179 1181
1180 if (! (STRINGP (string) || VECTORP (string))) 1182 if (! (STRINGP (string) || VECTORP (string)))
1181 wrong_type_argument (Qarrayp, string); 1183 wrong_type_argument (Qarrayp, string);
@@ -2044,7 +2046,13 @@ internal_equal (o1, o2, depth)
2044 STRING_BYTES (XSTRING (o1)))) 2046 STRING_BYTES (XSTRING (o1))))
2045 return 0; 2047 return 0;
2046 return 1; 2048 return 1;
2049
2050 case Lisp_Int:
2051 case Lisp_Symbol:
2052 case Lisp_Type_Limit:
2053 break;
2047 } 2054 }
2055
2048 return 0; 2056 return 0;
2049} 2057}
2050 2058
@@ -2577,7 +2585,7 @@ Only the last argument is not altered, and need not be a list.")
2577 register int argnum; 2585 register int argnum;
2578 register Lisp_Object tail, tem, val; 2586 register Lisp_Object tail, tem, val;
2579 2587
2580 val = Qnil; 2588 val = tail = Qnil;
2581 2589
2582 for (argnum = 0; argnum < nargs; argnum++) 2590 for (argnum = 0; argnum < nargs; argnum++)
2583 { 2591 {
@@ -3050,7 +3058,9 @@ Normally the return value is FEATURE.")
3050 register Lisp_Object tem; 3058 register Lisp_Object tem;
3051 CHECK_SYMBOL (feature, 0); 3059 CHECK_SYMBOL (feature, 0);
3052 tem = Fmemq (feature, Vfeatures); 3060 tem = Fmemq (feature, Vfeatures);
3061
3053 LOADHIST_ATTACH (Fcons (Qrequire, feature)); 3062 LOADHIST_ATTACH (Fcons (Qrequire, feature));
3063
3054 if (NILP (tem)) 3064 if (NILP (tem))
3055 { 3065 {
3056 int count = specpdl_ptr - specpdl; 3066 int count = specpdl_ptr - specpdl;