2002-08-15
2002-08-15 14:50:28 by Marcus Comstedt <marcus@mc.pp.se>
-
5aad93d0f00ff6eaf5b329826eb84e35b67fc4b4
(101 lines)
(+51/-50)
[
Show
| Annotate
]
Branch: 7.9
Rename fatal -> Pike_fatal.
Rev: src/apply_low.h:1.7
Rev: src/array.c:1.129
Rev: src/array.h:1.41
Rev: src/backend.cmod:1.27
Rev: src/bignum.c:1.25
Rev: src/block_alloc.h:1.41
Rev: src/builtin.cmod:1.90
Rev: src/builtin_functions.c:1.435
Rev: src/callback.c:1.26
Rev: src/code/ia32.c:1.21
Rev: src/code/ppc32.c:1.16
Rev: src/code/ppc32.h:1.14
Rev: src/code/sparc.c:1.11
Rev: src/code/sparc.h:1.13
Rev: src/compilation.h:1.28
Rev: src/constants.c:1.38
Rev: src/cpp.c:1.102
Rev: src/cyclic.c:1.6
Rev: src/dlopen.c:1.32
Rev: src/docode.c:1.144
Rev: src/dynamic_buffer.c:1.16
Rev: src/dynamic_load.c:1.64
Rev: src/encode.c:1.151
Rev: src/error.c:1.86
Rev: src/fd_control.c:1.41
Rev: src/fdlib.c:1.52
Rev: src/fdlib.h:1.41
Rev: src/fsort_template.h:1.11
Rev: src/gc.c:1.185
Rev: src/gc.h:1.90
Rev: src/hashtable.c:1.11
Rev: src/interpret.c:1.263
Rev: src/interpret.h:1.110
Rev: src/interpret_functions.h:1.105
Rev: src/interpreter.h:1.76
Rev: src/iterators.cmod:1.26
Rev: src/language.yacc:1.289
Rev: src/las.c:1.297
Rev: src/lex.c:1.105
Rev: src/lexer.h:1.38
Rev: src/main.c:1.150
Rev: src/mapping.c:1.149
Rev: src/module_support.c:1.46
Rev: src/modules/Gmp/mpf.cmod:1.9
Rev: src/modules/Gmp/mpq.cmod:1.10
Rev: src/modules/Gmp/mpz_glue.c:1.107
Rev: src/modules/HTTPLoop/cache.c:1.17
Rev: src/modules/HTTPLoop/requestobject.c:1.21
Rev: src/modules/Image/colors.c:1.61
Rev: src/modules/Image/colortable.c:1.109
Rev: src/modules/Image/colortable_lookup.h:1.18
Rev: src/modules/Image/encodings/bmp.c:1.35
Rev: src/modules/Image/font.c:1.72
Rev: src/modules/Image/image_module.c:1.14
Rev: src/modules/Image/layers.c:1.79
Rev: src/modules/Odbc/odbc.c:1.30
Rev: src/modules/Oracle/oracle.c:1.70
Rev: src/modules/PDF/pdf_module.c:1.11
Rev: src/modules/Parser/html.c:1.152
Rev: src/modules/Parser/parser.c:1.14
Rev: src/modules/Perl/perlmod.c:1.25
Rev: src/modules/Pipe/pipe.c:1.49
Rev: src/modules/_Charset/charsetmod.c:1.35
Rev: src/modules/_Charset/iso2022.c:1.23
Rev: src/modules/files/file.c:1.239
Rev: src/modules/files/sendfile.c:1.57
Rev: src/modules/files/socket.c:1.63
Rev: src/modules/files/stat.c:1.22
Rev: src/modules/files/udp.c:1.37
Rev: src/modules/spider/xml.c:1.52
Rev: src/modules/sprintf/sprintf.c:1.93
Rev: src/modules/sybase/sybase.c:1.9
Rev: src/multiset.c:1.50
Rev: src/multiset.h:1.25
Rev: src/object.c:1.203
Rev: src/object.h:1.71
Rev: src/opcodes.c:1.122
Rev: src/operators.c:1.159
Rev: src/peep.c:1.72
Rev: src/pike_error.h:1.19
Rev: src/pike_macros.h:1.31
Rev: src/pike_memory.c:1.120
Rev: src/pike_search.c:1.9
Rev: src/pike_search_engine.c:1.8
Rev: src/pike_search_engine2.c:1.5
Rev: src/pike_threadlib.h:1.16
Rev: src/pike_types.c:1.194
Rev: src/pike_types.h:1.79
Rev: src/port.c:1.52
Rev: src/post_modules/GTK/source/support.c:1.33
Rev: src/post_modules/Unicode/normalize.c:1.9
Rev: src/preprocessor.h:1.51
Rev: src/program.c:1.441
Rev: src/queue.c:1.8
Rev: src/rbtree.c:1.10
Rev: src/rbtree_low.h:1.2
Rev: src/signal_handler.c:1.225
Rev: src/stralloc.c:1.143
Rev: src/stralloc.h:1.66
Rev: src/svalue.c:1.144
Rev: src/svalue.h:1.106
Rev: src/threads.c:1.180
27:
#define HUGE HUGE_VAL
#endif /*!HUGE*/
- RCSID("$Id: stralloc.c,v 1.142 2002/05/31 22:41:26 nilsson Exp $");
+ RCSID("$Id: stralloc.c,v 1.143 2002/08/15 14:49:25 marcus Exp $");
/* #define STRALLOC_USE_PRIMES */
151:
case 1: return ((unsigned INT16 *)str)[pos];
case 2: return ((unsigned INT32 *)str)[pos];
}
- fatal("Illegal shift size!\n");
+ Pike_fatal("Illegal shift size!\n");
return 0;
}
161: Inside #if defined(PIKE_DEBUG)
#ifdef PIKE_DEBUG
if(pos > s->len || pos<0) {
if (s->len) {
- fatal("String index %ld is out of range [0 - %ld]!\n",
+ Pike_fatal("String index %ld is out of range [0 - %ld]!\n",
DO_NOT_WARN((long)pos),
DO_NOT_WARN((long)s->len-1));
} else {
- fatal("Attempt to index the empty string with %ld!\n",
+ Pike_fatal("Attempt to index the empty string with %ld!\n",
DO_NOT_WARN((long)pos));
}
}
178: Inside #if defined(PIKE_DEBUG)
{
#ifdef PIKE_DEBUG
if(pos > s->len || pos<0)
- fatal("string index out of range!\n");
+ Pike_fatal("string index out of range!\n");
if(pos == s->len && value)
- fatal("string zero termination foul!\n");
+ Pike_fatal("string zero termination foul!\n");
#endif
switch(s->size_shift)
{
189:
case 1: STR1(s)[pos]=value; break;
case 2: STR2(s)[pos]=value; break;
default:
- fatal("Illegal shift size!\n");
+ Pike_fatal("Illegal shift size!\n");
}
}
197: Inside #if defined(PIKE_DEBUG)
PMOD_EXPORT INLINE struct pike_string *debug_check_size_shift(struct pike_string *a,int shift)
{
if(a->size_shift != shift)
- fatal("Wrong STRX macro used!\n");
+ Pike_fatal("Wrong STRX macro used!\n");
return a;
}
#endif
241: Inside #if defined(PIKE_DEBUG)
{
#ifdef PIKE_DEBUG
if(len<0)
- fatal("Cannot copy %ld bytes!\n",
+ Pike_fatal("Cannot copy %ld bytes!\n",
DO_NOT_WARN((long)len));
#endif
367: Inside #if defined(PIKE_DEBUG)
{
debug_dump_pike_string(curr, 70);
locate_problem(has_zero_refs);
- fatal("String with no references.\n");
+ Pike_fatal("String with no references.\n");
}
#endif
debug_malloc_touch(curr);
436: Inside #if defined(PIKE_DEBUG)
{
debug_dump_pike_string(curr, 70);
locate_problem(has_zero_refs);
- fatal("String with no references.\n");
+ Pike_fatal("String with no references.\n");
}
#endif
}
530:
really_free_short_pike_string1((struct short_pike_string1 *)s); \
DO_IF_DEBUG( \
} else if (s->size_shift != 2) { \
- fatal("Unsupported string shift: %d\n", s->size_shift); \
+ Pike_fatal("Unsupported string shift: %d\n", s->size_shift); \
) \
} else { \
really_free_short_pike_string2((struct short_pike_string2 *)s); \
644: Inside #if defined(PIKE_DEBUG)
t = (struct pike_string *)alloc_short_pike_string1();
#ifdef PIKE_DEBUG
} else if (shift != 2) {
- fatal("Unsupported string shift: %d\n", shift);
+ Pike_fatal("Unsupported string shift: %d\n", shift);
#endif /* PIKE_DEBUG */
} else {
t = (struct pike_string *)alloc_short_pike_string2();
673: Inside #if defined(PIKE_DEBUG)
s2 = internal_findstring(s->str, len, s->size_shift, h);
#ifdef PIKE_DEBUG
if(s2==s)
- fatal("end_shared_string called twice! (or something like that)\n");
+ Pike_fatal("end_shared_string called twice! (or something like that)\n");
#endif
if(s2)
700:
switch(s->size_shift)
{
default:
- fatal("ARGHEL! size_shift:%d\n", s->size_shift);
+ Pike_fatal("ARGHEL! size_shift:%d\n", s->size_shift);
case 2:
switch(find_magnitude2(STR2(s),s->len))
742: Inside #if defined(PIKE_DEBUG)
struct pike_string *tmp;
#ifdef PIKE_DEBUG
if(len > str->len)
- fatal("Cannot extend string here!\n");
+ Pike_fatal("Cannot extend string here!\n");
#endif
if( str->len <= SHORT_STRING_THRESHOLD ?
(len <= SHORT_STRING_THRESHOLD) :
787:
case 2:
return make_shared_binary_string2((p_wchar2 *)(str.ptr), len);
default:
- fatal("Unknown string width!\n");
+ Pike_fatal("Unknown string width!\n");
}
/* NOT REACHED */
return NULL; /* Keep the compiler happy */
900: Inside #if defined(PIKE_DEBUG)
propagate_shared_string(s,h);
#ifdef PIKE_DEBUG
if (base_table[h] != s) {
- fatal("propagate_shared_string() failed. Probably got bogus pike_string.\n");
+ Pike_fatal("propagate_shared_string() failed. Probably got bogus pike_string.\n");
}
#endif /* PIKE_DEBUG */
base_table[h]=s->next;
935: Inside #if defined(PIKE_DEBUG)
extern int d_flag;
if (d_flag) {
if (s->refs) {
- fatal("Freeing string with references!\n");
+ Pike_fatal("Freeing string with references!\n");
}
if(d_flag > 2)
{
if(s->next == (struct pike_string *)(ptrdiff_t)-1)
- fatal("Freeing shared string again!\n");
+ Pike_fatal("Freeing shared string again!\n");
if(((ptrdiff_t)s->next) & 1)
- fatal("Freeing shared string again, memory corrupt or other bug!\n");
+ Pike_fatal("Freeing shared string again, memory corrupt or other bug!\n");
}
}
if ((s->size_shift < 0) || (s->size_shift > 2)) {
- fatal("Freeing string with bad shift (0x%08x); could it be a type?\n",
+ Pike_fatal("Freeing string with bad shift (0x%08x); could it be a type?\n",
s->size_shift);
}
#endif
1029: Inside #if defined(PIKE_DEBUG)
if(current_do_debug_cycle == last_stralloc_verify)
{
if(debug_findstring(s) !=s)
- fatal("Shared string not shared.\n");
+ Pike_fatal("Shared string not shared.\n");
}else{
if(do_hash(s) != s->hval)
{
locate_problem(wrong_hash);
- fatal("Hash value changed?\n");
+ Pike_fatal("Hash value changed?\n");
}
if(debug_findstring(s) !=s)
- fatal("Shared string not shared.\n");
+ Pike_fatal("Shared string not shared.\n");
if(index_shared_string(s,s->len))
{
locate_problem(improper_zero_termination);
- fatal("Shared string is not zero terminated properly.\n");
+ Pike_fatal("Shared string is not zero terminated properly.\n");
}
}
}
1065: Inside #if defined(PIKE_DEBUG)
h++;
if (bad_pointer(s)) {
- fatal("Odd string pointer in string table!\n");
+ Pike_fatal("Odd string pointer in string table!\n");
}
if(s->len < 0)
- fatal("Shared string shorter than zero bytes.\n");
+ Pike_fatal("Shared string shorter than zero bytes.\n");
if(s->refs <= 0)
{
locate_problem(has_zero_refs);
- fatal("Shared string had too few references.\n");
+ Pike_fatal("Shared string had too few references.\n");
}
if(index_shared_string(s,s->len))
{
locate_problem(improper_zero_termination);
- fatal("Shared string didn't end with a zero.\n");
+ Pike_fatal("Shared string didn't end with a zero.\n");
}
if(do_hash(s) != s->hval)
- fatal("Shared string hashed to other number.\n");
+ Pike_fatal("Shared string hashed to other number.\n");
if(HMODULO(s->hval) != e)
{
locate_problem(wrong_hash);
- fatal("Shared string hashed to wrong place.\n");
+ Pike_fatal("Shared string hashed to wrong place.\n");
}
if(h>10000)
1097: Inside #if defined(PIKE_DEBUG)
struct pike_string *s2;
for(s2=s;s2;s2=s2->next)
if(s2 == s)
- fatal("Shared string table is cyclic.\n");
+ Pike_fatal("Shared string table is cyclic.\n");
h=0;
}
}
UNLOCK_BUCKET(e);
}
if(num != num_strings)
- fatal("Num strings is wrong %d!=%d\n",num,num_strings);
+ Pike_fatal("Num strings is wrong %d!=%d\n",num,num_strings);
}
PMOD_EXPORT int safe_debug_findstring(struct pike_string *foo)
1445: Inside #if defined(PIKE_DEBUG)
INT32 old_value;
#ifdef PIKE_DEBUG
if(index<0 || index>=a->len)
- fatal("Index out of range in modify_shared_string()\n");
+ Pike_fatal("Index out of range in modify_shared_string()\n");
#endif
1486:
return end_shared_string(b);
default:
- fatal("Odd wide string conversion!\n");
+ Pike_fatal("Odd wide string conversion!\n");
}
}
1506:
switch(a->size_shift)
{
case 0:
- fatal("Unshrinkable!\n");
+ Pike_fatal("Unshrinkable!\n");
case 1:
/* Test if we *actually* can shrink it.. */
1636: Inside #if defined(PIKE_DEBUG)
#ifdef PIKE_DEBUG
if((r < haystack->str) ||
(r - haystack->str)>>haystack->size_shift > haystack->len)
- fatal("string_search did a bobo!\n");
+ Pike_fatal("string_search did a bobo!\n");
#endif
return (r-haystack->str)>>haystack->size_shift;
}
1648: Inside #if defined(PIKE_DEBUG)
#ifdef PIKE_DEBUG
if(start < 0 || len<0 || start+len>s->len )
{
- fatal("string_slice, start = %ld, len = %ld, s->len = %ld\n",
+ Pike_fatal("string_slice, start = %ld, len = %ld, s->len = %ld\n",
DO_NOT_WARN((long)start),
DO_NOT_WARN((long)len),
DO_NOT_WARN((long)s->len));
1672:
case 2:
return make_shared_binary_string2(STR2(s)+start,len);
}
- fatal("Illegal shift size!\n");
+ Pike_fatal("Illegal shift size!\n");
return 0;
}
1727:
case 1: f=(replace_searchfunc)mojt.vtab->func1; break;
case 2: f=(replace_searchfunc)mojt.vtab->func2; break;
#ifdef PIKE_DEBUG
- default: fatal("Illegal shift.\n");
+ default: Pike_fatal("Illegal shift.\n");
#endif
}
1744:
case 1: f=(replace_searchfunc)mojt.vtab->func1; break;
case 2: f=(replace_searchfunc)mojt.vtab->func2; break;
#ifdef PIKE_DEBUG
- default: fatal("Illegal shift.\n");
+ default: Pike_fatal("Illegal shift.\n");
#endif
}
1770: Inside #if defined(PIKE_DEBUG)
{
#ifdef PIKE_DEBUG
if(tmp + (del->len << str->size_shift) > end)
- fatal("generic_memory_search found a match beyond end of string!!!\n");
+ Pike_fatal("generic_memory_search found a match beyond end of string!!!\n");
#endif
generic_memcpy(r,MKPCHARP(s,str->size_shift),(tmp-s)>>str->size_shift);
INC_PCHARP(r,(tmp-s)>>str->size_shift);
1888: Inside #if defined(PIKE_DEBUG)
}
#ifdef PIKE_DEBUG
if(num_strings != num_)
- fatal("Num strings is wrong! %d!=%d.\n",num_strings, num_);
+ Pike_fatal("Num strings is wrong! %d!=%d.\n",num_strings, num_);
#endif
num[0]=num_;
size[0]=size_;
2020:
case 1: convert_0_to_1(STR1(s->s)+s->s->len,(p_wchar0 *)str,len); break;
case 2: convert_0_to_2(STR2(s->s)+s->s->len,(p_wchar0 *)str,len); break;
default:
- fatal("Illegal magnitude!\n");
+ Pike_fatal("Illegal magnitude!\n");
}
s->s->len+=len;
/* Ensure NUL-termination */
2058: Inside #if defined(PIKE_DEBUG)
#ifdef PIKE_DEBUG
if(len<=0)
- fatal("Cannot fill with zero length strings!\n");
+ Pike_fatal("Cannot fill with zero length strings!\n");
#endif
if(howmany<=0) return;
2169:
case 1: return MKPCHARP(MEMCHR1((p_wchar1 *)ptr.ptr,chr,len),1);
case 2: return MKPCHARP(MEMCHR2((p_wchar2 *)ptr.ptr,chr,len),2);
}
- fatal("Illegal shift in MEMCHR_PCHARP.\n");
+ Pike_fatal("Illegal shift in MEMCHR_PCHARP.\n");
return MKPCHARP(0,0); /* make wcc happy */
}
2576:
return 0;
default:
- fatal("Illegal shift size in string.\n");
+ Pike_fatal("Illegal shift size in string.\n");
}
return 0;
}
2599:
return 0;
default:
- fatal("Illegal shift size in string.\n");
+ Pike_fatal("Illegal shift size in string.\n");
}
return 0;
}
2625:
return STR2(s);
default:
- fatal("Illegal shift size in string.\n");
+ Pike_fatal("Illegal shift size in string.\n");
}
return 0;
}