From 2274cb0e4c8ba8be89eada75e92d0fd31be147e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= Date: Tue, 14 Aug 2012 15:24:27 +0000 Subject: [PATCH] Boost Jam cleanup - renamed the path_key__register_long_name() function to path_register_key() and improved related comments, minor stylistic changes. [SVN r80035] --- v2/engine/filent.c | 13 +++++++------ v2/engine/pathsys.h | 7 ++++--- v2/engine/pathunix.c | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/v2/engine/filent.c b/v2/engine/filent.c index 3ad367c58..f213bdeec 100644 --- a/v2/engine/filent.c +++ b/v2/engine/filent.c @@ -4,11 +4,12 @@ * This file is part of Jam - see jam.c for Copyright information. */ -/* This file is ALSO: - * Copyright 2001-2004 David Abrahams. - * Copyright 2005 Rene Rivera. - * Distributed under the Boost Software License, Version 1.0. - * (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) +/* This file is ALSO: + * Copyright 2001-2004 David Abrahams. + * Copyright 2005 Rene Rivera. + * Distributed under the Boost Software License, Version 1.0. + * (See accompanying file LICENSE_1_0.txt or copy at + * http://www.boost.org/LICENSE_1_0.txt) */ /* @@ -111,7 +112,7 @@ int file_collect_dir_content_( file_info_t * const d ) path_build( &f, pathname ); pathname_obj = object_new( pathname->value ); - path_key__register_long_path( pathname_obj ); + path_register_key( pathname_obj ); files = list_push_back( files, pathname_obj ); { file_info_t * const ff = file_info( pathname_obj ); diff --git a/v2/engine/pathsys.h b/v2/engine/pathsys.h index 6b01acfed..84f052bd1 100644 --- a/v2/engine/pathsys.h +++ b/v2/engine/pathsys.h @@ -58,10 +58,11 @@ void path_parent( PATHNAME * f ); OBJECT * path_as_key( OBJECT * path ); /* Called as an optimization when we know we have a path that is already in its - * long/key form. Avoids the need for some subsequent path_as_key() call to do a - * potentially expensive short-->long path conversion. + * canonical/long/key form. Avoids the need for some subsequent path_as_key() + * call to do a potentially expensive path conversion requiring access to the + * actual underlying file system. */ -void path_key__register_long_path( OBJECT * long_path ); +void path_register_key( OBJECT * long_path ); #ifdef USE_PATHUNIX /* Returns a static pointer to the system dependent path to the temporary diff --git a/v2/engine/pathunix.c b/v2/engine/pathunix.c index 945ac72b5..3e344bdbb 100644 --- a/v2/engine/pathunix.c +++ b/v2/engine/pathunix.c @@ -472,7 +472,7 @@ static path_key_entry * path_key( OBJECT * const path, } -void path_key__register_long_path( OBJECT * long_path ) +void path_register_key( OBJECT * long_path ) { path_key( long_path, 1 ); } @@ -504,7 +504,7 @@ void path_done( void ) #else /* NT */ -void path_key__register_long_path( OBJECT * path ) +void path_register_key( OBJECT * path ) { }