summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2006-07-25 09:10:03 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2006-07-25 09:10:03 +0000
commitf6aa297e5f7c76790bb5a9018dcb07102f93fc9b (patch)
treef5303c9c1eab817905e4164ef7450017a9931a36
parent0c1806f21a6d8204c586cd4cbc458a3539169f88 (diff)
INTEGRATION: CWS rt15 (1.1.1.1.150); FILE MERGED
2006/06/28 15:11:42 rt 1.1.1.1.150.1: #i54459# CVS history removed from file.
-rw-r--r--dmake/dbug/malloc/m_perror.c40
-rw-r--r--dmake/dbug/malloc/malloc.c47
-rw-r--r--dmake/dbug/malloc/malloc.h38
-rw-r--r--dmake/dbug/malloc/mallopt.c47
-rw-r--r--dmake/dbug/malloc/memory.c50
-rw-r--r--dmake/dbug/malloc/mlc_chk.c43
-rw-r--r--dmake/dbug/malloc/realloc.c55
-rw-r--r--dmake/dbug/malloc/string.c50
8 files changed, 8 insertions, 362 deletions
diff --git a/dmake/dbug/malloc/m_perror.c b/dmake/dbug/malloc/m_perror.c
index ad582acea37c..b5620182ac4e 100644
--- a/dmake/dbug/malloc/m_perror.c
+++ b/dmake/dbug/malloc/m_perror.c
@@ -6,7 +6,7 @@
#ifndef lint
static
-char rcsid[] = "$Id: m_perror.c,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $";
+char rcsid[] = "$Id: m_perror.c,v 1.2 2006-07-25 10:08:21 rt Exp $";
#endif
/*
@@ -71,41 +71,3 @@ malloc_perror(str)
(void) write(2,"\n",(unsigned)1);
}
-/*
- * $Log: not supported by cvs2svn $
- * Revision 1.1.1.1 1997/09/22 14:51:11 hjs
- * dmake 4.1 orginal sourcen
- *
- * Revision 1.1.1.1 1997/07/15 16:02:26 dvadura
- * dmake gold 4.1.00 initial import
- *
- * Revision 1.1.1.1 1996/10/27 07:30:14 dvadura
- * Dmake 4.1 Initial Import
- *
- * Revision 1.1.1.1 1996/10/24 05:33:14 dvadura
- * Initial import for final release of dmake 4.1
- *
- * Revision 1.1 1994/10/06 17:43:12 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1994/10/06 03:45:21 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1992/01/24 03:29:04 dvadura
- * dmake Version 3.8, Initial revision
- *
- * Revision 1.5 90/08/29 21:25:08 cpcahil
- * added additional error message that was missing (and
- * caused a core dump)
- *
- * Revision 1.4 90/05/11 00:13:08 cpcahil
- * added copyright statment
- *
- * Revision 1.3 90/02/24 21:50:21 cpcahil
- * lots of lint fixes
- *
- * Revision 1.2 90/02/24 17:39:55 cpcahil
- * 1. added function header
- * 2. added rcs id and log strings.
- *
- */
diff --git a/dmake/dbug/malloc/malloc.c b/dmake/dbug/malloc/malloc.c
index e2f060f1d0ac..ff84e3efce9f 100644
--- a/dmake/dbug/malloc/malloc.c
+++ b/dmake/dbug/malloc/malloc.c
@@ -23,7 +23,7 @@
*/
#ifndef lint
static
-char rcs_hdr[] = "$Id: malloc.c,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $";
+char rcs_hdr[] = "$Id: malloc.c,v 1.2 2006-07-25 10:08:36 rt Exp $";
#endif
extern int malloc_checking;
@@ -625,48 +625,3 @@ malloc_err_handler(level)
} /* malloc_err_handler(... */
-/*
- * $Log: not supported by cvs2svn $
- * Revision 1.1.1.1 1997/09/22 14:51:11 hjs
- * dmake 4.1 orginal sourcen
- *
- * Revision 1.1.1.1 1997/07/15 16:02:26 dvadura
- * dmake gold 4.1.00 initial import
- *
- * Revision 1.1.1.1 1996/10/27 07:30:14 dvadura
- * Dmake 4.1 Initial Import
- *
- * Revision 1.1.1.1 1996/10/24 05:33:14 dvadura
- * Initial import for final release of dmake 4.1
- *
- * Revision 1.1 1994/10/06 17:43:12 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1994/10/06 03:45:22 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1992/01/24 03:29:05 dvadura
- * dmake Version 3.8, Initial revision
- *
- * Revision 1.6 90/05/11 00:13:09 cpcahil
- * added copyright statment
- *
- * Revision 1.5 90/02/25 11:01:18 cpcahil
- * added support for malloc chain checking.
- *
- * Revision 1.4 90/02/24 21:50:21 cpcahil
- * lots of lint fixes
- *
- * Revision 1.3 90/02/24 14:51:18 cpcahil
- * 1. changed malloc_fatal and malloc_warn to use malloc_errno and be passed
- * the function name as a parameter.
- * 2. Added several function headers.
- * 3. Changed uses of malloc_fatal/warning to conform to new usage.
- *
- * Revision 1.2 90/02/23 18:05:23 cpcahil
- * fixed open of error log to use append mode.
- *
- * Revision 1.1 90/02/22 23:17:43 cpcahil
- * Initial revision
- *
- */
diff --git a/dmake/dbug/malloc/malloc.h b/dmake/dbug/malloc/malloc.h
index 0f34d49e1b72..ed8c34f2a333 100644
--- a/dmake/dbug/malloc/malloc.h
+++ b/dmake/dbug/malloc/malloc.h
@@ -4,7 +4,7 @@
* copyright statement is not removed.
*/
/*
- * $Id: malloc.h,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $
+ * $Id: malloc.h,v 1.2 2006-07-25 10:08:50 rt Exp $
*/
struct mlist
{
@@ -83,39 +83,3 @@ void malloc_check_data();
void malloc_check_str();
void malloc_verify();
-/*
- * $Log: not supported by cvs2svn $
- * Revision 1.1.1.1 1997/09/22 14:51:11 hjs
- * dmake 4.1 orginal sourcen
- *
- * Revision 1.1.1.1 1997/07/15 16:02:26 dvadura
- * dmake gold 4.1.00 initial import
- *
- * Revision 1.1.1.1 1996/10/27 07:30:14 dvadura
- * Dmake 4.1 Initial Import
- *
- * Revision 1.1.1.1 1996/10/24 05:33:14 dvadura
- * Initial import for final release of dmake 4.1
- *
- * Revision 1.1 1994/10/06 17:43:13 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1994/10/06 03:45:22 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1992/01/24 03:29:06 dvadura
- * dmake Version 3.8, Initial revision
- *
- * Revision 1.4 90/08/29 22:23:38 cpcahil
- * fixed mallopt to use a union as an argument.
- *
- * Revision 1.3 90/05/11 11:04:10 cpcahil
- * took out some extraneous lines
- *
- * Revision 1.2 90/05/11 00:13:09 cpcahil
- * added copyright statment
- *
- * Revision 1.1 90/02/23 07:09:03 cpcahil
- * Initial revision
- *
- */
diff --git a/dmake/dbug/malloc/mallopt.c b/dmake/dbug/malloc/mallopt.c
index a3151d4730ac..d70daf88647a 100644
--- a/dmake/dbug/malloc/mallopt.c
+++ b/dmake/dbug/malloc/mallopt.c
@@ -22,7 +22,7 @@
#ifndef lint
static
-char rcs_hdr[] = "$Id: mallopt.c,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $";
+char rcs_hdr[] = "$Id: mallopt.c,v 1.2 2006-07-25 10:09:05 rt Exp $";
#endif
int
@@ -96,48 +96,3 @@ mallopt(cmd,value)
return(0);
}
-/*
- * $Log: not supported by cvs2svn $
- * Revision 1.1.1.1 1997/09/22 14:51:11 hjs
- * dmake 4.1 orginal sourcen
- *
- * Revision 1.1.1.1 1997/07/15 16:02:26 dvadura
- * dmake gold 4.1.00 initial import
- *
- * Revision 1.1.1.1 1996/10/27 07:30:14 dvadura
- * Dmake 4.1 Initial Import
- *
- * Revision 1.1.1.1 1996/10/24 05:33:14 dvadura
- * Initial import for final release of dmake 4.1
- *
- * Revision 1.1 1994/10/06 17:43:14 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1994/10/06 03:45:23 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1992/01/24 03:29:07 dvadura
- * dmake Version 3.8, Initial revision
- *
- * Revision 1.6 90/08/29 22:23:36 cpcahil
- * fixed mallopt to use a union as an argument.
- *
- * Revision 1.5 90/08/29 21:22:51 cpcahil
- * miscellaneous lint fixes
- *
- * Revision 1.4 90/05/11 00:13:10 cpcahil
- * added copyright statment
- *
- * Revision 1.3 90/02/25 11:03:26 cpcahil
- * changed to return int so that it agrees with l libmalloc.a's mallopt()
- *
- * Revision 1.2 90/02/25 11:01:21 cpcahil
- * added support for malloc chain checking.
- *
- * Revision 1.1 90/02/24 21:50:24 cpcahil
- * Initial revision
- *
- * Revision 1.1 90/02/24 17:10:53 cpcahil
- * Initial revision
- *
- */
diff --git a/dmake/dbug/malloc/memory.c b/dmake/dbug/malloc/memory.c
index 986007b1b77f..b2087a76f5af 100644
--- a/dmake/dbug/malloc/memory.c
+++ b/dmake/dbug/malloc/memory.c
@@ -6,7 +6,7 @@
#ifndef lint
static
-char rcs_hdr[] = "$Id: memory.c,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $";
+char rcs_hdr[] = "$Id: memory.c,v 1.2 2006-07-25 10:09:19 rt Exp $";
#endif
void malloc_check_data();
@@ -193,51 +193,3 @@ bcmp(ptr2, ptr1, len)
return( memcmp(ptr1,ptr2,len) );
}
-/*
- * $Log: not supported by cvs2svn $
- * Revision 1.1.1.1 1997/09/22 14:51:11 hjs
- * dmake 4.1 orginal sourcen
- *
- * Revision 1.1.1.1 1997/07/15 16:02:26 dvadura
- * dmake gold 4.1.00 initial import
- *
- * Revision 1.1.1.1 1996/10/27 07:30:14 dvadura
- * Dmake 4.1 Initial Import
- *
- * Revision 1.1.1.1 1996/10/24 05:33:14 dvadura
- * Initial import for final release of dmake 4.1
- *
- * Revision 1.1 1994/10/06 17:43:14 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1994/10/06 03:45:23 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1992/01/24 03:29:08 dvadura
- * dmake Version 3.8, Initial revision
- *
- * Revision 1.7 90/08/29 21:27:58 cpcahil
- * fixed value of check in memccpy when character was not found.
- *
- * Revision 1.6 90/07/16 20:06:26 cpcahil
- * fixed several minor bugs found with Henry Spencer's string/mem tester
- * program.
- *
- *
- * Revision 1.5 90/05/11 15:39:36 cpcahil
- * fixed bug in memccpy().
- *
- * Revision 1.4 90/05/11 00:13:10 cpcahil
- * added copyright statment
- *
- * Revision 1.3 90/02/24 21:50:29 cpcahil
- * lots of lint fixes
- *
- * Revision 1.2 90/02/24 17:29:41 cpcahil
- * changed $Header to $Id so full path wouldnt be included as part of rcs
- * id string
- *
- * Revision 1.1 90/02/22 23:17:43 cpcahil
- * Initial revision
- *
- */
diff --git a/dmake/dbug/malloc/mlc_chk.c b/dmake/dbug/malloc/mlc_chk.c
index 077e675240bf..08a01172cb66 100644
--- a/dmake/dbug/malloc/mlc_chk.c
+++ b/dmake/dbug/malloc/mlc_chk.c
@@ -10,7 +10,7 @@
#ifndef lint
static
-char rcs_hdr[] = "$Id: mlc_chk.c,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $";
+char rcs_hdr[] = "$Id: mlc_chk.c,v 1.2 2006-07-25 10:09:34 rt Exp $";
#endif
extern struct mlist malloc_start;
@@ -254,44 +254,3 @@ malloc_verify(func,ptr,len)
return;
}
-/*
- * $Log: not supported by cvs2svn $
- * Revision 1.1.1.1 1997/09/22 14:51:11 hjs
- * dmake 4.1 orginal sourcen
- *
- * Revision 1.1.1.1 1997/07/15 16:02:26 dvadura
- * dmake gold 4.1.00 initial import
- *
- * Revision 1.1.1.1 1996/10/27 07:30:14 dvadura
- * Dmake 4.1 Initial Import
- *
- * Revision 1.1.1.1 1996/10/24 05:33:14 dvadura
- * Initial import for final release of dmake 4.1
- *
- * Revision 1.1 1994/10/06 17:43:15 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1994/10/06 03:45:24 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1992/01/24 03:29:09 dvadura
- * dmake Version 3.8, Initial revision
- *
- * Revision 1.5 90/08/29 22:23:48 cpcahil
- * added new function to check on strings up to a specified length
- * and used it within several strn* functions.
- *
- * Revision 1.4 90/05/11 00:13:09 cpcahil
- * added copyright statment
- *
- * Revision 1.3 90/02/24 21:50:22 cpcahil
- * lots of lint fixes
- *
- * Revision 1.2 90/02/24 17:29:38 cpcahil
- * changed $Header to $Id so full path wouldnt be included as part of rcs
- * id string
- *
- * Revision 1.1 90/02/24 14:57:03 cpcahil
- * Initial revision
- *
- */
diff --git a/dmake/dbug/malloc/realloc.c b/dmake/dbug/malloc/realloc.c
index 43bc20fa7841..2801cd86212d 100644
--- a/dmake/dbug/malloc/realloc.c
+++ b/dmake/dbug/malloc/realloc.c
@@ -40,7 +40,7 @@
*/
#ifndef lint
static
-char rcs_hdr[] = "$Id: realloc.c,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $";
+char rcs_hdr[] = "$Id: realloc.c,v 1.2 2006-07-25 10:09:48 rt Exp $";
#endif
char *
@@ -178,56 +178,3 @@ realloc(cptr,size)
} /* realloc(... */
-/*
- * $Log: not supported by cvs2svn $
- * Revision 1.1.1.1 1997/09/22 14:51:11 hjs
- * dmake 4.1 orginal sourcen
- *
- * Revision 1.1.1.1 1997/07/15 16:02:26 dvadura
- * dmake gold 4.1.00 initial import
- *
- * Revision 1.1.1.1 1996/10/27 07:30:14 dvadura
- * Dmake 4.1 Initial Import
- *
- * Revision 1.1.1.1 1996/10/24 05:33:14 dvadura
- * Initial import for final release of dmake 4.1
- *
- * Revision 1.1 1994/10/06 17:43:17 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1994/10/06 03:45:26 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1992/01/24 03:29:11 dvadura
- * dmake Version 3.8, Initial revision
- *
- * Revision 1.8 90/08/29 21:22:52 cpcahil
- * miscellaneous lint fixes
- *
- * Revision 1.7 90/05/11 00:13:10 cpcahil
- * added copyright statment
- *
- * Revision 1.6 90/02/25 11:01:20 cpcahil
- * added support for malloc chain checking.
- *
- * Revision 1.5 90/02/24 21:50:31 cpcahil
- * lots of lint fixes
- *
- * Revision 1.4 90/02/24 17:29:39 cpcahil
- * changed $Header to $Id so full path wouldnt be included as part of rcs
- * id string
- *
- * Revision 1.3 90/02/24 17:20:00 cpcahil
- * attempt to get rid of full path in rcs header.
- *
- * Revision 1.2 90/02/24 15:14:20 cpcahil
- * 1. added function header
- * 2. changed calls to malloc_warning to conform to new usage
- * 3. added setting of malloc_errno
- * 4. broke up bad pointer determination so that errno's would be more
- * descriptive
- *
- * Revision 1.1 90/02/22 23:17:43 cpcahil
- * Initial revision
- *
- */
diff --git a/dmake/dbug/malloc/string.c b/dmake/dbug/malloc/string.c
index 8ca3a1eee167..7b92bf07ad1b 100644
--- a/dmake/dbug/malloc/string.c
+++ b/dmake/dbug/malloc/string.c
@@ -11,7 +11,7 @@
#ifndef lint
static
-char rcs_hdr[] = "$Id: string.c,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $";
+char rcs_hdr[] = "$Id: string.c,v 1.2 2006-07-25 10:10:03 rt Exp $";
#endif
int malloc_checking = 0;
@@ -531,51 +531,3 @@ strtoken(stringp, delim, skip)
/* NOTREACHED */
}
-/*
- * $Log: not supported by cvs2svn $
- * Revision 1.1.1.1 1997/09/22 14:51:11 hjs
- * dmake 4.1 orginal sourcen
- *
- * Revision 1.1.1.1 1997/07/15 16:02:26 dvadura
- * dmake gold 4.1.00 initial import
- *
- * Revision 1.1.1.1 1996/10/27 07:30:14 dvadura
- * Dmake 4.1 Initial Import
- *
- * Revision 1.1.1.1 1996/10/24 05:33:14 dvadura
- * Initial import for final release of dmake 4.1
- *
- * Revision 1.1 1994/10/06 17:43:17 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1994/10/06 03:45:27 dvadura
- * dmake Release Version 4.0, Initial revision
- *
- * Revision 1.1 1992/01/24 03:29:13 dvadura
- * dmake Version 3.8, Initial revision
- *
- * Revision 1.7 90/08/29 22:24:19 cpcahil
- * added new function to check on strings up to a specified length
- * and used it within several strn* functions.
- *
- * Revision 1.6 90/07/16 20:06:56 cpcahil
- * fixed several minor bugs found with Henry Spencer's string/mem function
- * tester program.
- *
- * Revision 1.5 90/06/10 14:59:49 cpcahil
- * Fixed a couple of bugs in strncpy & strdup
- *
- * Revision 1.4 90/05/11 00:13:10 cpcahil
- * added copyright statment
- *
- * Revision 1.3 90/02/24 21:50:32 cpcahil
- * lots of lint fixes
- *
- * Revision 1.2 90/02/24 17:29:40 cpcahil
- * changed $Header to $Id so full path wouldnt be included as part of rcs
- * id string
- *
- * Revision 1.1 90/02/22 23:17:44 cpcahil
- * Initial revision
- *
- */