From 42f1bd9b2228aaca4fb8a5597a3b5774f7ef6876 Mon Sep 17 00:00:00 2001 From: Felipe Oliveira Carvalho Date: Sat, 19 Apr 2014 02:12:47 -0300 Subject: No OOM error condition in ga_concat_strings(), concat_fnames(), concat_str() - xmallocz() is not static anymore. There are many use cases for this function in the codebase and we should start using it. - Simpler types in ga_concat_strings() --- src/quickfix.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/quickfix.c') diff --git a/src/quickfix.c b/src/quickfix.c index 46511b2c19..6bc959db5c 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -1119,8 +1119,8 @@ static int qf_get_fnum(char_u *directory, char_u *fname) slash_adjust(directory); slash_adjust(fname); #endif - if (directory != NULL && !vim_isAbsName(fname) - && (ptr = concat_fnames(directory, fname, TRUE)) != NULL) { + if (directory != NULL && !vim_isAbsName(fname)) { + ptr = concat_fnames(directory, fname, TRUE); /* * Here we check if the file really exists. * This should normally be true, but if make works without @@ -1280,10 +1280,7 @@ static char_u *qf_guess_filepath(char_u *filename) vim_free(fullname); fullname = concat_fnames(ds_ptr->dirname, filename, TRUE); - /* If concat_fnames failed, just go on. The worst thing that can happen - * is that we delete the entire stack. - */ - if (fullname != NULL && os_file_exists(fullname)) + if (os_file_exists(fullname)) break; ds_ptr = ds_ptr->next; -- cgit