summary refs log tree commit diff stats
path: root/lib/wrappers/zip/zzip.nim
diff options
context:
space:
mode:
Diffstat (limited to 'lib/wrappers/zip/zzip.nim')
-rw-r--r--lib/wrappers/zip/zzip.nim100
1 files changed, 52 insertions, 48 deletions
diff --git a/lib/wrappers/zip/zzip.nim b/lib/wrappers/zip/zzip.nim
index 73fd53c34..fab7d55b3 100644
--- a/lib/wrappers/zip/zzip.nim
+++ b/lib/wrappers/zip/zzip.nim
@@ -27,7 +27,8 @@ else:
     dllname = "libzzip.so"
 
 type 
-  TZZipError* = int32
+  TZZipError* = int32 # Name conflict if we drop the `T`
+
 const
   ZZIP_ERROR* = -4096'i32
   ZZIP_NO_ERROR* = 0'i32            # no error, may be used if user sets it.
@@ -54,119 +55,122 @@ const
   ZZIP_THREADED* = 1'i32 shl 19'i32
   
 type
-  TZZipDir* {.final, pure.} = object
-  TZZipFile* {.final, pure.} = object
-  TZZipPluginIO* {.final, pure.} = object
+  ZZipDir* {.final, pure.} = object
+  ZZipFile* {.final, pure.} = object
+  ZZipPluginIO* {.final, pure.} = object
 
-  TZZipDirent* {.final, pure.} = object  
+  ZZipDirent* {.final, pure.} = object  
     d_compr*: int32  ## compression method
     d_csize*: int32  ## compressed size  
     st_size*: int32  ## file size / decompressed size
     d_name*: cstring ## file name / strdupped name
 
-  TZZipStat* = TZZipDirent    
+  ZZipStat* = ZZipDirent
+{.deprecated: [TZZipDir: ZzipDir, TZZipFile: ZzipFile,
+              TZZipPluginIO: ZzipPluginIO, TZZipDirent: ZzipDirent,
+              TZZipStat: ZZipStat].}
 
 proc zzip_strerror*(errcode: int32): cstring  {.cdecl, dynlib: dllname, 
     importc: "zzip_strerror".}
-proc zzip_strerror_of*(dir: ptr TZZipDir): cstring  {.cdecl, dynlib: dllname, 
+proc zzip_strerror_of*(dir: ptr ZZipDir): cstring  {.cdecl, dynlib: dllname, 
     importc: "zzip_strerror_of".}
 proc zzip_errno*(errcode: int32): int32 {.cdecl, dynlib: dllname, 
     importc: "zzip_errno".}
 
-proc zzip_geterror*(dir: ptr TZZipDir): int32 {.cdecl, dynlib: dllname, 
+proc zzip_geterror*(dir: ptr ZZipDir): int32 {.cdecl, dynlib: dllname, 
     importc: "zzip_error".}
-proc zzip_seterror*(dir: ptr TZZipDir, errcode: int32) {.cdecl, dynlib: dllname, 
+proc zzip_seterror*(dir: ptr ZZipDir, errcode: int32) {.cdecl, dynlib: dllname, 
     importc: "zzip_seterror".}
 proc zzip_compr_str*(compr: int32): cstring {.cdecl, dynlib: dllname, 
     importc: "zzip_compr_str".}
-proc zzip_dirhandle*(fp: ptr TZZipFile): ptr TZZipDir {.cdecl, dynlib: dllname, 
+proc zzip_dirhandle*(fp: ptr ZZipFile): ptr ZZipDir {.cdecl, dynlib: dllname, 
     importc: "zzip_dirhandle".}
-proc zzip_dirfd*(dir: ptr TZZipDir): int32 {.cdecl, dynlib: dllname, 
+proc zzip_dirfd*(dir: ptr ZZipDir): int32 {.cdecl, dynlib: dllname, 
     importc: "zzip_dirfd".}
-proc zzip_dir_real*(dir: ptr TZZipDir): int32 {.cdecl, dynlib: dllname, 
+proc zzip_dir_real*(dir: ptr ZZipDir): int32 {.cdecl, dynlib: dllname, 
     importc: "zzip_dir_real".}
-proc zzip_file_real*(fp: ptr TZZipFile): int32 {.cdecl, dynlib: dllname, 
+proc zzip_file_real*(fp: ptr ZZipFile): int32 {.cdecl, dynlib: dllname, 
     importc: "zzip_file_real".}
-proc zzip_realdir*(dir: ptr TZZipDir): pointer {.cdecl, dynlib: dllname, 
+proc zzip_realdir*(dir: ptr ZZipDir): pointer {.cdecl, dynlib: dllname, 
     importc: "zzip_realdir".}
-proc zzip_realfd*(fp: ptr TZZipFile): int32 {.cdecl, dynlib: dllname, 
+proc zzip_realfd*(fp: ptr ZZipFile): int32 {.cdecl, dynlib: dllname, 
     importc: "zzip_realfd".}
 
-proc zzip_dir_alloc*(fileext: cstringArray): ptr TZZipDir {.cdecl, 
+proc zzip_dir_alloc*(fileext: cstringArray): ptr ZZipDir {.cdecl, 
     dynlib: dllname, importc: "zzip_dir_alloc".}
-proc zzip_dir_free*(para1: ptr TZZipDir): int32 {.cdecl, dynlib: dllname, 
+proc zzip_dir_free*(para1: ptr ZZipDir): int32 {.cdecl, dynlib: dllname, 
     importc: "zzip_dir_free".}
 
-proc zzip_dir_fdopen*(fd: int32, errcode_p: ptr TZZipError): ptr TZZipDir {.cdecl, 
+proc zzip_dir_fdopen*(fd: int32, errcode_p: ptr TZZipError): ptr ZZipDir {.cdecl, 
     dynlib: dllname, importc: "zzip_dir_fdopen".}
-proc zzip_dir_open*(filename: cstring, errcode_p: ptr TZZipError): ptr TZZipDir {.
+proc zzip_dir_open*(filename: cstring, errcode_p: ptr TZZipError): ptr ZZipDir {.
     cdecl, dynlib: dllname, importc: "zzip_dir_open".}
-proc zzip_dir_close*(dir: ptr TZZipDir) {.cdecl, dynlib: dllname, 
+proc zzip_dir_close*(dir: ptr ZZipDir) {.cdecl, dynlib: dllname, 
     importc: "zzip_dir_close".}
-proc zzip_dir_read*(dir: ptr TZZipDir, dirent: ptr TZZipDirent): int32 {.cdecl, 
+proc zzip_dir_read*(dir: ptr ZZipDir, dirent: ptr ZZipDirent): int32 {.cdecl, 
     dynlib: dllname, importc: "zzip_dir_read".}
 
-proc zzip_opendir*(filename: cstring): ptr TZZipDir {.cdecl, dynlib: dllname, 
+proc zzip_opendir*(filename: cstring): ptr ZZipDir {.cdecl, dynlib: dllname, 
     importc: "zzip_opendir".}
-proc zzip_closedir*(dir: ptr TZZipDir) {.cdecl, dynlib: dllname, 
+proc zzip_closedir*(dir: ptr ZZipDir) {.cdecl, dynlib: dllname, 
     importc: "zzip_closedir".}
-proc zzip_readdir*(dir: ptr TZZipDir): ptr TZZipDirent {.cdecl, dynlib: dllname, 
+proc zzip_readdir*(dir: ptr ZZipDir): ptr ZZipDirent {.cdecl, dynlib: dllname, 
     importc: "zzip_readdir".}
-proc zzip_rewinddir*(dir: ptr TZZipDir) {.cdecl, dynlib: dllname, 
+proc zzip_rewinddir*(dir: ptr ZZipDir) {.cdecl, dynlib: dllname, 
                                       importc: "zzip_rewinddir".}
-proc zzip_telldir*(dir: ptr TZZipDir): int {.cdecl, dynlib: dllname, 
+proc zzip_telldir*(dir: ptr ZZipDir): int {.cdecl, dynlib: dllname, 
     importc: "zzip_telldir".}
-proc zzip_seekdir*(dir: ptr TZZipDir, offset: int) {.cdecl, dynlib: dllname, 
+proc zzip_seekdir*(dir: ptr ZZipDir, offset: int) {.cdecl, dynlib: dllname, 
     importc: "zzip_seekdir".}
 
-proc zzip_file_open*(dir: ptr TZZipDir, name: cstring, flags: int32): ptr TZZipFile {.
+proc zzip_file_open*(dir: ptr ZZipDir, name: cstring, flags: int32): ptr ZZipFile {.
     cdecl, dynlib: dllname, importc: "zzip_file_open".}
-proc zzip_file_close*(fp: ptr TZZipFile) {.cdecl, dynlib: dllname, 
+proc zzip_file_close*(fp: ptr ZZipFile) {.cdecl, dynlib: dllname, 
     importc: "zzip_file_close".}
-proc zzip_file_read*(fp: ptr TZZipFile, buf: pointer, length: int): int {.
+proc zzip_file_read*(fp: ptr ZZipFile, buf: pointer, length: int): int {.
     cdecl, dynlib: dllname, importc: "zzip_file_read".}
-proc zzip_open*(name: cstring, flags: int32): ptr TZZipFile {.cdecl, 
+proc zzip_open*(name: cstring, flags: int32): ptr ZZipFile {.cdecl, 
     dynlib: dllname, importc: "zzip_open".}
-proc zzip_close*(fp: ptr TZZipFile) {.cdecl, dynlib: dllname, 
+proc zzip_close*(fp: ptr ZZipFile) {.cdecl, dynlib: dllname, 
     importc: "zzip_close".}
-proc zzip_read*(fp: ptr TZZipFile, buf: pointer, length: int): int {.
+proc zzip_read*(fp: ptr ZZipFile, buf: pointer, length: int): int {.
     cdecl, dynlib: dllname, importc: "zzip_read".}
 
-proc zzip_freopen*(name: cstring, mode: cstring, para3: ptr TZZipFile): ptr TZZipFile {.
+proc zzip_freopen*(name: cstring, mode: cstring, para3: ptr ZZipFile): ptr ZZipFile {.
     cdecl, dynlib: dllname, importc: "zzip_freopen".}
-proc zzip_fopen*(name: cstring, mode: cstring): ptr TZZipFile {.cdecl, 
+proc zzip_fopen*(name: cstring, mode: cstring): ptr ZZipFile {.cdecl, 
     dynlib: dllname, importc: "zzip_fopen".}
 proc zzip_fread*(p: pointer, size: int, nmemb: int, 
-                 file: ptr TZZipFile): int {.cdecl, dynlib: dllname, 
+                 file: ptr ZZipFile): int {.cdecl, dynlib: dllname, 
     importc: "zzip_fread".}
-proc zzip_fclose*(fp: ptr TZZipFile) {.cdecl, dynlib: dllname, 
+proc zzip_fclose*(fp: ptr ZZipFile) {.cdecl, dynlib: dllname, 
     importc: "zzip_fclose".}
 
-proc zzip_rewind*(fp: ptr TZZipFile): int32 {.cdecl, dynlib: dllname, 
+proc zzip_rewind*(fp: ptr ZZipFile): int32 {.cdecl, dynlib: dllname, 
     importc: "zzip_rewind".}
-proc zzip_seek*(fp: ptr TZZipFile, offset: int, whence: int32): int {.
+proc zzip_seek*(fp: ptr ZZipFile, offset: int, whence: int32): int {.
     cdecl, dynlib: dllname, importc: "zzip_seek".}
-proc zzip_tell*(fp: ptr TZZipFile): int {.cdecl, dynlib: dllname, 
+proc zzip_tell*(fp: ptr ZZipFile): int {.cdecl, dynlib: dllname, 
     importc: "zzip_tell".}
 
-proc zzip_dir_stat*(dir: ptr TZZipDir, name: cstring, zs: ptr TZZipStat, 
+proc zzip_dir_stat*(dir: ptr ZZipDir, name: cstring, zs: ptr ZZipStat, 
                     flags: int32): int32 {.cdecl, dynlib: dllname, 
     importc: "zzip_dir_stat".}
-proc zzip_file_stat*(fp: ptr TZZipFile, zs: ptr TZZipStat): int32 {.cdecl, 
+proc zzip_file_stat*(fp: ptr ZZipFile, zs: ptr ZZipStat): int32 {.cdecl, 
     dynlib: dllname, importc: "zzip_file_stat".}
-proc zzip_fstat*(fp: ptr TZZipFile, zs: ptr TZZipStat): int32 {.cdecl, dynlib: dllname, 
+proc zzip_fstat*(fp: ptr ZZipFile, zs: ptr ZZipStat): int32 {.cdecl, dynlib: dllname, 
     importc: "zzip_fstat".}
 
-proc zzip_open_shared_io*(stream: ptr TZZipFile, name: cstring, 
+proc zzip_open_shared_io*(stream: ptr ZZipFile, name: cstring, 
                           o_flags: int32, o_modes: int32, ext: cstringArray, 
-                          io: ptr TZZipPluginIO): ptr TZZipFile {.cdecl, 
+                          io: ptr ZZipPluginIO): ptr ZZipFile {.cdecl, 
     dynlib: dllname, importc: "zzip_open_shared_io".}
 proc zzip_open_ext_io*(name: cstring, o_flags: int32, o_modes: int32, 
-                       ext: cstringArray, io: ptr TZZipPluginIO): ptr TZZipFile {.
+                       ext: cstringArray, io: ptr ZZipPluginIO): ptr ZZipFile {.
     cdecl, dynlib: dllname, importc: "zzip_open_ext_io".}
 proc zzip_opendir_ext_io*(name: cstring, o_modes: int32, 
-                          ext: cstringArray, io: ptr TZZipPluginIO): ptr TZZipDir {.
+                          ext: cstringArray, io: ptr ZZipPluginIO): ptr ZZipDir {.
     cdecl, dynlib: dllname, importc: "zzip_opendir_ext_io".}
 proc zzip_dir_open_ext_io*(filename: cstring, errcode_p: ptr TZZipError, 
-                           ext: cstringArray, io: ptr TZZipPluginIO): ptr TZZipDir {.
+                           ext: cstringArray, io: ptr ZZipPluginIO): ptr ZZipDir {.
     cdecl, dynlib: dllname, importc: "zzip_dir_open_ext_io".}