From d20e6398e288393720f762d011dc332cf2262fd7 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Sat, 30 Jun 2012 02:31:13 +0000 Subject: Ported to modern libc --- usr/src/make_src/Make/bin/make/common/implicit.cc | 1 - usr/src/make_src/Make/bin/make/common/nse_printdep.cc | 1 - usr/src/make_src/Make/bin/make/common/read.cc | 2 +- usr/src/make_src/Make/bin/make/common/read2.cc | 2 +- usr/src/make_src/Make/bin/make/common/rep.cc | 12 ++++++------ 5 files changed, 8 insertions(+), 10 deletions(-) (limited to 'usr/src/make_src/Make/bin') diff --git a/usr/src/make_src/Make/bin/make/common/implicit.cc b/usr/src/make_src/Make/bin/make/common/implicit.cc index a9b2f1d..5a6d1c0 100644 --- a/usr/src/make_src/Make/bin/make/common/implicit.cc +++ b/usr/src/make_src/Make/bin/make/common/implicit.cc @@ -96,7 +96,6 @@ extern void add_target_to_chain(Name target, Chain * query); * recursion_level Used for tracing */ -extern int printf (const char *, ...); static Boolean actual_doname = false; diff --git a/usr/src/make_src/Make/bin/make/common/nse_printdep.cc b/usr/src/make_src/Make/bin/make/common/nse_printdep.cc index cda02f8..8b8785a 100644 --- a/usr/src/make_src/Make/bin/make/common/nse_printdep.cc +++ b/usr/src/make_src/Make/bin/make/common/nse_printdep.cc @@ -49,7 +49,6 @@ static void print_rule(register Name target); static void print_rec_info(Name target); static Boolean is_out_of_date(Property line); extern void depvar_print_results (void); -extern int printf (const char *, ...); extern int _flsbuf (unsigned int, FILE *); /* diff --git a/usr/src/make_src/Make/bin/make/common/read.cc b/usr/src/make_src/Make/bin/make/common/read.cc index 586d609..74bccfd 100644 --- a/usr/src/make_src/Make/bin/make/common/read.cc +++ b/usr/src/make_src/Make/bin/make/common/read.cc @@ -395,7 +395,7 @@ read_simple_file(register Name makefile_name, register Boolean chase_path, regis stdin_text_p = getmem(length = 1024); stdin_buffer_end = stdin_text_p + length; MBSTOWCS(wcs_buffer, NOCATGETS("standard input")); - file_being_read = (wchar_t *) wsdup(wcs_buffer); + file_being_read = (wchar_t *) wcsdup(wcs_buffer); line_number = 0; while ((n = read(fileno(stdin), stdin_text_p, diff --git a/usr/src/make_src/Make/bin/make/common/read2.cc b/usr/src/make_src/Make/bin/make/common/read2.cc index e1a9e1f..dd38359 100644 --- a/usr/src/make_src/Make/bin/make/common/read2.cc +++ b/usr/src/make_src/Make/bin/make/common/read2.cc @@ -1605,7 +1605,7 @@ make_relative(wchar_t *to, wchar_t *result) } MBSTOWCS(wcs_buffer, get_current_path()); - from = allocated = (wchar_t *) wsdup(wcs_buffer); + from = allocated = (wchar_t *) wcsdup(wcs_buffer); /* * Find the number of components in the from name. diff --git a/usr/src/make_src/Make/bin/make/common/rep.cc b/usr/src/make_src/Make/bin/make/common/rep.cc index 6ad4007..d6b35f9 100644 --- a/usr/src/make_src/Make/bin/make/common/rep.cc +++ b/usr/src/make_src/Make/bin/make/common/rep.cc @@ -141,16 +141,16 @@ report_recursive_init(void) /* * set conditional_macro_string if string is present */ - rp->oldline = (wchar_t *) wsdup(line); + rp->oldline = (wchar_t *) wcsdup(line); if ( dollar != NULL ){ rp->cond_macrostring = - (wchar_t *) wsdup(dollar - VER_LEN + 1); + (wchar_t *) wcsdup(dollar - VER_LEN + 1); } /* * get target name into recursive struct */ *colon = (int) nul_char; - rp->target = (wchar_t *) wsdup(line); + rp->target = (wchar_t *) wcsdup(line); *bpatch = rp; bpatch = &rp->next; } @@ -188,14 +188,14 @@ report_recursive_dep(Name target, wchar_t *line) (void) memset((char *) rp, 0, sizeof (Recursive_make_rec)); wchar_t * wcb = get_wstring(target->string_mb); // XXX Tolik: needs retmem rp->target = wcb; - rp->newline = (wchar_t *) wsdup(line); - rp->cond_macrostring = (wchar_t *) wsdup(rec_buf); + rp->newline = (wchar_t *) wcsdup(line); + rp->cond_macrostring = (wchar_t *) wcsdup(rec_buf); *bpatch = rp; bpatch = &rp->next; changed = true; } else { if ((rp->oldline != NULL) && !IS_WEQUAL(rp->oldline, line)) { - rp->newline = (wchar_t *) wsdup(line); + rp->newline = (wchar_t *) wcsdup(line); changed = true; } rp->removed = false; -- cgit v1.2.3