diff --git a/gcc/cobol/cbldiag.h b/gcc/cobol/cbldiag.h index 7fc479da151e43d485b8d865f86c5eaf9ecf3402..9ca23b4150b0951aa3992ecf63a463b3181717d1 100644 --- a/gcc/cobol/cbldiag.h +++ b/gcc/cobol/cbldiag.h @@ -103,10 +103,10 @@ template <typename LOC> static void location_dump( const char func[], int line, const char tag[], const LOC& loc) { extern int yy_flex_debug; - if( yy_flex_debug && getenv("update_location") ) + if( yy_flex_debug && getenv("update_location") ) fprintf(stderr, "%s:%d: %s location (%d,%d) to (%d,%d)\n", - func, line, tag, - loc.first_line, loc.first_column, loc.last_line, loc.last_column); + func, line, tag, + loc.first_line, loc.first_column, loc.last_line, loc.last_column); } #endif // defined(yy_flex_debug) diff --git a/gcc/cobol/cdf-copy.cc b/gcc/cobol/cdf-copy.cc index a7c95e1db75ed7b4d0d325dff5c7cdaab8a1b15d..6b1901e90dac96d0606266fc7a3666bc08de685c 100644 --- a/gcc/cobol/cdf-copy.cc +++ b/gcc/cobol/cdf-copy.cc @@ -278,20 +278,20 @@ copybook_elem_t::open_file( const char directory[], bool literally ) { } else { const char *dir = directory? directory : library.name; path = xasprintf( "%s/%s", dir, source.name ); - } + } } else { path = xasprintf( "%s", source.name ); } gcc_assert(path); - + if( literally ) { dbgmsg("copybook_elem_t::open_file: trying %s", path); if( (this->fd = open(path, O_RDONLY)) == -1 ) { dbgmsg("could not open %s: %m", path); return fd; - } + } this->source.name = path; if( ! cobol_filename(this->source.name, inode_of(fd)) ) { error_msg(source.loc, "recursive copybook: '%s' includes itself", path); @@ -301,7 +301,7 @@ copybook_elem_t::open_file( const char directory[], bool literally ) { return fd; } gcc_assert( ! literally ); - + if( extensions ) { pattern = xasprintf("%s{,.cpy,.CPY,.cbl,.CBL,.cob,.COB,%s}", path, this->extensions); diff --git a/gcc/cobol/copybook.h b/gcc/cobol/copybook.h index 81a2b27eda1e71043972e31419854b676eac5630..3e2cf9d934e86e210374b2fe9620f61000482bbb 100644 --- a/gcc/cobol/copybook.h +++ b/gcc/cobol/copybook.h @@ -92,7 +92,7 @@ class copybook_elem_t { int open_file( const char dir[], bool literally = false ); void extensions_add( const char ext[], const char alt[] ); - + static inline bool is_quote( const char ch ) { return ch == '\'' || ch == '"'; } @@ -145,7 +145,7 @@ class copybook_t { } if( false && value != uname ) { dbgmsg("using copybook file '%s' from environment variable '%s'", - value, name); + value, name); } return xstrdup(value); } @@ -184,9 +184,9 @@ class copybook_t { for( auto dir : directories ) { if( true ) { dbgmsg("copybook_t::open '%s' OF '%s' %s", - book.source.name, - dir? dir: ".", - book.literally.source? ", literally" : "" ); + book.source.name, + dir? dir: ".", + book.literally.source? ", literally" : "" ); } if( (fd = book.open_file(dir, book.literally.source)) != -1 ) break; }