@@ -1088,7 +1088,7 @@ impl<B: OdbBackend> Backend<B> {
1088
1088
inner : stream,
1089
1089
} ;
1090
1090
1091
- * stream_out = unsafe { allocate ( stream) . cast ( ) } ;
1091
+ * stream_out = unsafe { box_allocate ( stream) . cast ( ) } ;
1092
1092
1093
1093
raw:: GIT_OK
1094
1094
}
@@ -1134,7 +1134,7 @@ impl<B: OdbBackend> Backend<B> {
1134
1134
inner : stream,
1135
1135
} ;
1136
1136
1137
- * stream_out = unsafe { allocate ( stream) . cast ( ) } ;
1137
+ * stream_out = unsafe { box_allocate ( stream) . cast ( ) } ;
1138
1138
1139
1139
raw:: GIT_OK
1140
1140
}
@@ -1217,10 +1217,9 @@ impl<B: OdbBackend> Backend<B> {
1217
1217
} ,
1218
1218
inner : writepack,
1219
1219
} ;
1220
- let writepack = Box :: into_raw ( Box :: new ( writepack) ) ;
1221
1220
1222
1221
let out_writepack = unsafe { out_writepack_ptr. as_mut ( ) . unwrap ( ) } ;
1223
- * out_writepack = writepack. cast ( ) ;
1222
+ * out_writepack = unsafe { box_allocate ( writepack) . cast ( ) } ;
1224
1223
1225
1224
raw:: GIT_OK
1226
1225
}
@@ -1249,8 +1248,7 @@ impl<B: OdbBackend> Backend<B> {
1249
1248
}
1250
1249
1251
1250
extern "C" fn free ( backend : * mut raw:: git_odb_backend ) {
1252
- let inner = unsafe { Box :: from_raw ( backend. cast :: < Self > ( ) ) } ;
1253
- drop ( inner) ;
1251
+ unsafe { box_free ( backend. cast :: < Self > ( ) ) }
1254
1252
}
1255
1253
}
1256
1254
@@ -1306,8 +1304,7 @@ where
1306
1304
raw:: GIT_OK
1307
1305
}
1308
1306
extern "C" fn free ( writepack_ptr : * mut raw:: git_odb_writepack ) {
1309
- let inner = unsafe { Box :: from_raw ( writepack_ptr. cast :: < Self > ( ) ) } ;
1310
- drop ( inner) ;
1307
+ unsafe { box_free ( writepack_ptr. cast :: < Self > ( ) ) }
1311
1308
}
1312
1309
}
1313
1310
@@ -1379,15 +1376,15 @@ impl<B, T> Stream<B, T> {
1379
1376
}
1380
1377
1381
1378
extern "C" fn free ( stream_ptr : * mut raw:: git_odb_stream ) {
1382
- unsafe { free ( stream_ptr. cast :: < Self > ( ) ) }
1379
+ unsafe { box_free ( stream_ptr. cast :: < Self > ( ) ) }
1383
1380
}
1384
1381
}
1385
1382
type WriteStream < B > = Stream < B , <B as OdbBackend >:: WriteStream > ;
1386
1383
type ReadStream < B > = Stream < B , <B as OdbBackend >:: ReadStream > ;
1387
1384
1388
- unsafe fn allocate < T > ( value : T ) -> * mut T {
1385
+ unsafe fn box_allocate < T > ( value : T ) -> * mut T {
1389
1386
Box :: into_raw ( Box :: new ( value) )
1390
1387
}
1391
- unsafe fn free < T > ( ptr : * mut T ) {
1388
+ unsafe fn box_free < T > ( ptr : * mut T ) {
1392
1389
drop ( Box :: from_raw ( ptr) )
1393
1390
}
0 commit comments