Revert "Rename {newline,carriage_return} to output_{newline,carriage_…

…return}"

This reverts commit 9680d26.

libtrn/art.cpp

@@ -216,7 +216,7 @@ do_article_result do_article()
 	   : (linenum < g_tc_LINES);
 	     linenum++) {		/* for each line on page */
 	    if (g_int_count) {	/* exit via interrupt? */
-		output_newline();	/* get to left margin */
+		newline();	/* get to left margin */
 		g_int_count = 0;	/* reset interrupt count */
 		set_mode(g_general_mode,oldmode);
 		s_special = false;
@@ -358,7 +358,7 @@ do_article_result do_article()
 			    no_ulfire();
 #endif
 			underline();
-			output_carriage_return();
+			carriage_return();
 		    }
 		    if (*bufptr == '\n')
 			putchar(' ');
@@ -409,7 +409,7 @@ do_article_result do_article()
 			    int i;
 #ifdef USE_UTF_HACK
 			    if (outpos + visual_width_at(bufptr) > g_tc_COLS) { /* will line overflow? */
-				output_newline();
+				newline();
 				outpos = 0;
 				linenum++;
 			    }
@@ -445,7 +445,7 @@ do_article_result do_article()
 			}
 #endif
 			if (outputok)
-			    output_newline();
+			    newline();
 			s_restart = 0;
 			outpos = 1000;	/* signal normal \n */
 		    }
@@ -504,7 +504,7 @@ do_article_result do_article()
 		    s_restart = line_offset(bufptr);/* restart here next time */
 		    if (outputok) {
 			if (!g_tc_AM || g_tc_XN || outpos < g_tc_COLS)
-			    output_newline();
+			    newline();
 			else
 			    g_term_line++;
 		    }
@@ -520,7 +520,7 @@ do_article_result do_article()
 			un_standout();
 		    else
 			un_underline();
-		    output_carriage_return();
+		    carriage_return();
 		    g_highlight = -1;	/* no more we are */
 		    /* in case terminal highlighted rest of line earlier */
 		    /* when we did an eol with highlight turned on: */
@@ -862,7 +862,7 @@ page_switch_result page_switch()
 	if (*g_tc_IL && *g_tc_HO) {
             home_cursor();
 	    insert_line();
-	    output_carriage_return();
+	    carriage_return();
 	    ART_POS pos = vrdary(g_topline - 1);
 	    if (pos < 0)
 		pos = -pos;

libtrn/artsrch.cpp

@@ -284,7 +284,7 @@ art_search_result art_search(char *patbuf, int patbufsiz, bool get_cmd)
     }
     if (get_cmd) {
 	if (g_use_threads)
-	    output_newline();
+	    newline();
 	else {
 	    fputs("\nSearching...\n",stdout) FLUSH;
 	    termdown(2);

libtrn/datasrc.cpp

@@ -843,7 +843,7 @@ int srcfile_open(SRCFILE *sfp, const char *filename, const char *fetchcmd, const
 	    srcfile_close(sfp);
 	    return 0;
 	}
-	output_newline();
+	newline();
     }
     fseek(fp,0L,0);
 

libtrn/decode.cpp

@@ -273,7 +273,7 @@ bool decode_piece(MIMECAP_ENTRY *mcp, char *first_line)
 	if (g_nowait_fork)
 	    fflush(stdout);
 	else
-	    output_newline();
+	    newline();
 
 	sprintf(g_buf, "%s%d", dir, part);
 	fp = fopen(g_buf, "w");

libtrn/kfile.cpp

@@ -114,7 +114,7 @@ static void mention(const char *str)
 {
     if (g_verbose) {
 	color_string(COLOR_NOTICE,str);
-	output_newline();
+	newline();
     }
     else
 	putchar('.');
@@ -193,9 +193,9 @@ int do_kfile(FILE *kfp, int entering)
 	    if (last_kill_type) {
 		if (perform_status_end(g_ngptr->toread,"article")) {
 		    s_kill_mentioned = true;
-		    output_carriage_return();
+		    carriage_return();
 		    fputs(g_msg, stdout);
-		    output_newline();
+		    newline();
 		}
 	    }
 	    perform_status_init(g_ngptr->toread);
@@ -233,9 +233,9 @@ int do_kfile(FILE *kfp, int entering)
 		if (last_kill_type) {
 		    if (perform_status_end(g_ngptr->toread,"article")) {
 			s_kill_mentioned = true;
-			output_carriage_return();
+			carriage_return();
 			fputs(g_msg, stdout);
-			output_newline();
+			newline();
 		    }
 		}
 		perform_status_init(g_ngptr->toread);
@@ -305,9 +305,9 @@ int do_kfile(FILE *kfp, int entering)
     if (last_kill_type) {
 	if (perform_status_end(g_ngptr->toread,"article")) {
 	    s_kill_mentioned = true;
-	    output_carriage_return();
+	    carriage_return();
 	    fputs(g_msg, stdout);
-	    output_newline();
+	    newline();
 	}
     }
     return 0;
@@ -350,7 +350,7 @@ void kill_unwanted(ART_NUM starting, const char *message, int entering)
 	open_kfile(KF_GLOBAL);		/* Just in case the name changed */
 	if (s_globkfp && !intr)
 	    intr = do_kfile(s_globkfp,entering);
-	output_newline();
+	newline();
 	if (entering && s_kill_mentioned && g_novice_delays) {
 	    if (g_verbose)
 		get_anything();

libtrn/mime.cpp

@@ -767,12 +767,12 @@ void mime_DecodeArticle(bool view)
 	    }
 	    else {
 		if (*g_msg) {
-		    output_newline();
+		    newline();
 		    fputs(g_msg,stdout);
 		}
 		g_mime_state = SKIP_MIME;
 	    }
-	    output_newline();
+	    newline();
 	    break;
 	}
     }
@@ -877,7 +877,7 @@ decode_state qp_decode(FILE *ifp, decode_state state)
 	if (g_nowait_fork)
 	    fflush(stdout);
 	else
-	    output_newline();
+	    newline();
     }
 
     while ((c1 = mime_getc(ifp)) != EOF) {
@@ -982,7 +982,7 @@ decode_state b64_decode(FILE *ifp, decode_state state)
 	if (g_nowait_fork)
 	    fflush(stdout);
 	else
-	    output_newline();
+	    newline();
 	state = DECODE_ACTIVE;
     }
 
@@ -1069,7 +1069,7 @@ decode_state cat_decode(FILE *ifp, decode_state state)
 	if (g_nowait_fork)
 	    fflush(stdout);
 	else
-	    output_newline();
+	    newline();
     }
 
     if (ifp) {

libtrn/ng.cpp

@@ -436,7 +436,7 @@ do_newsgroup_result do_newsgroup(char *start_command)
 	    if (g_tc_LINES < 100 && !g_int_count)
 		*g_buf = '\f';		/* on CONT fake up refresh */
 	    else {
-		output_newline();		/* but only on a crt */
+		newline();		/* but only on a crt */
 		goto reask_article;
 	    }
 	}
@@ -502,7 +502,7 @@ do_newsgroup_result do_newsgroup(char *start_command)
     g_in_ng = false;			/* leave newsgroup state */
     artclose();
     if (!g_univ_ng_virtflag)
-	output_newline();
+	newline();
     deselect_all();
     yankback();				/* do a Y command */
     bits_to_rc();			/* reconstitute .newsrc line */
@@ -597,7 +597,7 @@ static art_switch_result art_switch()
       reask_unread:
 	in_char(u_prompt,MM_UNKILL_PROMPT,g_dfltcmd.c_str());
 	printcmd();
-	output_newline();
+	newline();
 	if (*g_buf == 'h') {
 	    if (g_verbose)
 	    {
@@ -787,10 +787,10 @@ static art_switch_result art_switch()
 	g_page_line = 1;
 	if (!thread_perform())
 	    return AS_INP;
-	output_carriage_return();
+	carriage_return();
 	perform_status_end(g_ngptr->toread, "article");
 	fputs(g_msg, stdout);
-	output_newline();
+	newline();
 	g_art = g_curr_art;
 	g_artp = g_curr_artp;
 	return AS_ASK;
@@ -956,7 +956,7 @@ static art_switch_result art_switch()
 		perform_status_end(g_ngptr->toread, "article");
 		fputs(g_msg, stdout) FLUSH;
 	    }
-	    output_newline();
+	    newline();
 	    return AS_ASK;
 	}
 	return AS_NORM;
@@ -1041,7 +1041,7 @@ static art_switch_result art_switch()
 	return AS_NORM;
       }
       case 'u':			/* unsubscribe from this newsgroup? */
-	output_newline();
+	newline();
 	printf(g_unsubto,g_ngname.c_str()) FLUSH;
 	termdown(1);
 	g_ngptr->subscribechar = NEGCHAR;
@@ -1088,7 +1088,7 @@ static art_switch_result art_switch()
 	termdown(2);
 	break;
       case 'j':
-	output_newline();
+	newline();
 	if (g_art >= g_absfirst && g_art <= g_lastart)
 	    mark_as_read(g_artp);
 	return AS_ASK;
@@ -1126,7 +1126,7 @@ static art_switch_result art_switch()
 	s_art_sel_ilock = false;
 	switch (*g_buf) {
 	  case '+':
-	    output_newline();
+	    newline();
 	    g_term_scrolled = g_tc_LINES;
 	    g_term_line = g_tc_LINES-1;
 	    return AS_ASK;
@@ -1307,7 +1307,7 @@ static art_switch_result art_switch()
 	return AS_ASK;
 #endif
       case 'a':			/* attachment-view command */
-	output_newline();
+	newline();
 	if (view_article() == SAVE_ABORT)
 	    return AS_INP;
 	g_int_count = 0;
@@ -1445,7 +1445,7 @@ char ask_catchup()
     int leave_unread = 0;
 
     if (!use_one_line)
-	output_newline();
+	newline();
 reask_catchup:
     if (g_verbose)
 	sprintf(g_buf,"Mark everything in %s as read?",g_ngname.c_str());
@@ -1477,7 +1477,7 @@ char ask_catchup()
     if (ch == 'n' || ch == 'q') {
 	if (use_one_line)
 	    return 'N';
-	output_newline();
+	newline();
 	return 'n';
     }
     if (ch == '#') {
@@ -1491,7 +1491,7 @@ char ask_catchup()
 	g_buf[1] = FINISHCMD;
 	if (!finish_command(false)) {
 	    use_one_line = false;
-	    output_newline();
+	    newline();
 	    goto reask_catchup;
 	}
 	else {
@@ -1520,17 +1520,17 @@ char ask_catchup()
 	    if (g_dmcount)
 		yankback();
 	}
-	output_newline();
+	newline();
     }
     else {
-	output_newline();
+	newline();
 	catch_up(g_ngptr, leave_unread, 1);
     }
     if (ch == 'u') {
 	g_ngptr->subscribechar = NEGCHAR;
 	g_ngptr->rc->flags |= RF_RCCHANGED;
 	g_newsgroup_toread--;
-	output_newline();
+	newline();
 	printf(g_unsubto,g_ngname.c_str());
 	printf("(If you meant to hit 'y' instead of 'u', press '-'.)\n") FLUSH;
 	termdown(2);
@@ -1628,7 +1628,7 @@ char ask_memorize(char_int ch)
     ARTICLE* artp_hold = g_artp;
 
     if (!use_one_line)
-	output_newline();
+	newline();
 reask_memorize:
     sprintf(g_cmd_buf,"%sMemorize %s command:", global_save?"Global-" : "",
 	    mode_string);
@@ -1688,14 +1688,14 @@ char ask_memorize(char_int ch)
 		termdown(2);
 	    }
 	}
-	output_newline();
+	newline();
 	termdown(9);
 	goto reask_memorize;
     }
     if (ch == 'q') {
 	if (use_one_line)
 	    return 'Q';
-	output_newline();
+	newline();
 	return 'q';
     }
     if (!thread_cmd) {
@@ -1819,6 +1819,6 @@ char ask_memorize(char_int ch)
 	goto reask_memorize;
     }
     if (!use_one_line)
-	output_newline();
+	newline();
     return ch;
 }

libtrn/ngstuff.cpp

@@ -461,7 +461,7 @@ int perform(char *cmdlst, int output_level)
 		fputs("\tWill return",stdout);
 	}
 	else if (ch == '=') {
-	    output_carriage_return();
+	    carriage_return();
 	    output_subject((char*)g_artp,0);
 	    output_level = 0;
 	}
@@ -507,7 +507,7 @@ int perform(char *cmdlst, int output_level)
 		    view_article();
 		else
 		    save_article();
-		output_newline();
+		newline();
 		output_level = 0;
 	    }
 	}
@@ -522,7 +522,7 @@ int perform(char *cmdlst, int output_level)
 	    break;
     }
     if (output_level && g_verbose)
-	output_newline();
+	newline();
     if (g_int_count) {
 	g_int_count = 0;
 	return -1;
@@ -634,7 +634,7 @@ int ng_perform(char *cmdlst, int output_level)
 	    break;
     }
     if (output_level && g_verbose)
-	output_newline();
+	newline();
     if (g_int_count) {
 	g_int_count = 0;
 	return -1;
@@ -718,7 +718,7 @@ int addgrp_perform(ADDGROUP *gp, char *cmdlst, int output_level)
 	    break;
     }
     if (output_level && g_verbose)
-	output_newline();
+	newline();
     if (g_int_count) {
 	g_int_count = 0;
 	return -1;