replacing sprintf #6

SymbolixAU · Jul 13, 2023 · 6aeb0ca · 6aeb0ca
1 parent 16a0419
commit 6aeb0ca
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/inst/include/h3libapi.h b/inst/include/h3libapi.h
@@ -387,11 +387,11 @@ inline  H3Error  stringToH3( const char *str, H3Index *out ) {
   return fun( str, out );
 }
 
-inline  H3Error  h3ToString( H3Index h, char *str, size_t sz ) {
-   H3Error (*fun)( H3Index, char*, size_t ) =
-    ( H3Error (*)( H3Index, char*, size_t )) R_GetCCallable("h3lib","h3ToString");
-  return fun( h, str, sz );
-}
+// inline  H3Error  h3ToString( H3Index h, char *str, size_t sz ) {
+//    H3Error (*fun)( H3Index, char*, size_t ) =
+//     ( H3Error (*)( H3Index, char*, size_t )) R_GetCCallable("h3lib","h3ToString");
+//   return fun( h, str, sz );
+// }
 
 inline  int  isValidCell( H3Index h ) {
    int (*fun)( H3Index ) =

diff --git a/src/h3Index.c b/src/h3Index.c
@@ -79,8 +79,9 @@ H3Error H3_EXPORT(h3ToString)(H3Index h, char *str, size_t sz) {
         // Buffer is potentially not large enough.
         return E_MEMORY_BOUNDS;
     }
-    sprintf(str, "%" PRIx64, h);
-    return E_SUCCESS;
+    //sprintf(str, "%" PRIx64, h);
+    //return E_SUCCESS;
+    return E_FAILED;
 }
 
 /**

diff --git a/src/h3api.h b/src/h3api.h
@@ -487,7 +487,7 @@ DECLSPEC H3Error H3_EXPORT(stringToH3)(const char *str, H3Index *out);
  * @{
  */
 /** @brief converts an H3Index to a canonical string */
-DECLSPEC H3Error H3_EXPORT(h3ToString)(H3Index h, char *str, size_t sz);
+//DECLSPEC H3Error H3_EXPORT(h3ToString)(H3Index h, char *str, size_t sz);
 /** @} */
 
 /** @defgroup isValidCell isValidCell

diff --git a/src/init.c b/src/init.c
@@ -61,7 +61,7 @@ void attribute_visible R_init_h3lib(DllInfo *info)
   R_RegisterCCallable("h3lib", "getResolution",         (DL_FUNC) &getResolution);
   R_RegisterCCallable("h3lib", "getBaseCellNumber",         (DL_FUNC) &getBaseCellNumber);
   R_RegisterCCallable("h3lib", "stringToH3",         (DL_FUNC) &stringToH3);
-  R_RegisterCCallable("h3lib", "h3ToString",         (DL_FUNC) &h3ToString);
+  //R_RegisterCCallable("h3lib", "h3ToString",         (DL_FUNC) &h3ToString);
   R_RegisterCCallable("h3lib", "isValidCell",         (DL_FUNC) &isValidCell);
   R_RegisterCCallable("h3lib", "cellToParent",         (DL_FUNC) &cellToParent);
   R_RegisterCCallable("h3lib", "cellToChildrenSize",         (DL_FUNC) &cellToChildrenSize);