update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / tools / build / src / engine / pathnt.cpp

diff --git a/ceph/src/boost/tools/build/src/engine/pathnt.cpp b/ceph/src/boost/tools/build/src/engine/pathnt.cpp
index 5b0cc4659e94e3817c9d3f437cffae9d82424686..2e23a161763d000dfa6c066dc9675012e3882b65 100644 (file)
--- a/ceph/src/boost/tools/build/src/engine/pathnt.cpp
+++ b/ceph/src/boost/tools/build/src/engine/pathnt.cpp
@@ -8,8 +8,8 @@
  * 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)
+ * (See accompanying file LICENSE.txt or copy at
+ * https://www.bfgroup.xyz/b2/LICENSE.txt)
  */
 
 /*
@@ -17,6 +17,8 @@
  */
 
 #include "jam.h"
+#ifdef USE_PATHNT
+
 #include "pathsys.h"
 #include "hash.h"
 
@@ -94,11 +96,11 @@ void path_get_temp_path_( string * buffer )
  *  - path_key_cache path/key mapping cache object already initialized
  */
 
-static int canonicWindowsPath( char const * const path, int const path_length,
+static int canonicWindowsPath( char const * const path, int32_t path_length,
     string * const out )
 {
     char const * last_element;
-    unsigned long saved_size;
+    int32_t saved_size;
     char const * p;
     int missing_parent;
 
@@ -138,7 +140,7 @@ static int canonicWindowsPath( char const * const path, int const path_length,
     if ( p >= path )
     {
         char const * const dir = path;
-        int const dir_length = p - path;
+        const int32_t dir_length = int32_t(p - path);
         OBJECT * const dir_obj = object_new_range( dir, dir_length );
         int found;
         path_key_entry * const result = (path_key_entry *)hash_insert(
@@ -170,7 +172,7 @@ static int canonicWindowsPath( char const * const path, int const path_length,
     if ( !missing_parent )
     {
         char const * const n = last_element;
-        int const n_length = path + path_length - n;
+        int32_t n_length = int32_t(path + path_length - n);
         if ( !( n_length == 1 && n[ 0 ] == '.' )
             && !( n_length == 2 && n[ 0 ] == '.' && n[ 1 ] == '.' ) )
         {
@@ -239,7 +241,7 @@ static path_key_entry * path_key( OBJECT * const path,
     if ( !found )
     {
         OBJECT * normalized;
-        int normalized_size;
+        int32_t normalized_size;
         path_key_entry * nresult;
         result->path = path;
         {
@@ -394,8 +396,8 @@ OBJECT * path_as_key( OBJECT * path )
 static void free_path_key_entry( void * xentry, void * const data )
 {
     path_key_entry * const entry = (path_key_entry *)xentry;
-    object_free( entry->path );
-    object_free( entry->key );
+    if (entry->path) object_free( entry->path );
+    if (entry->key) object_free( entry->key );
 }
 
 
@@ -407,3 +409,5 @@ void path_done( void )
         hashdone( path_key_cache );
     }
 }
+
+#endif // USE_PATHNT