bobmaster/cChardet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use len() function

Browse source
This commit is contained in:
PyYoshi 2016-10-17 23:05:05 +09:00
parent 9e92a67276
commit 9e61cb9e96
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cchardet/_cchardet.pyx
View file

@ -1,16 +1,8 @@
from libc.stdlib cimport malloc, free
import warnings import warnings
cdef extern from "Python.h":
void * PyMem_Malloc(size_t)
void PyMem_Free(void *)
cdef extern from *: cdef extern from *:
ctypedef char* const_char_ptr "const char*" ctypedef char* const_char_ptr "const char*"
cdef extern from "string.h":
cdef int strlen(char *s)
cdef extern from "charsetdetect.h": cdef extern from "charsetdetect.h":
ctypedef void* csd_t ctypedef void* csd_t
cdef csd_t csd_open() cdef csd_t csd_open()
@ -20,7 +12,7 @@ cdef extern from "charsetdetect.h":
def detect(char *msg): def detect(char *msg):
cdef csd_t csd = csd_open() cdef csd_t csd = csd_open()
cdef int length = strlen(msg) cdef int length = len(msg)
cdef int result = csd_consider(csd, msg, length) cdef int result = csd_consider(csd, msg, length)
# ref: charsetdetect.cpp # ref: charsetdetect.cpp
if result == -1: # Error, signal with a negative number if result == -1: # Error, signal with a negative number
@ -35,7 +27,7 @@ def detect(char *msg):
def detect_with_confidence(char *msg): def detect_with_confidence(char *msg):
cdef csd_t csd = csd_open() cdef csd_t csd = csd_open()
cdef int length = strlen(msg) cdef int length = len(msg)
cdef int result = csd_consider(csd, msg, length) cdef int result = csd_consider(csd, msg, length)
cdef float confidence = 0.0 cdef float confidence = 0.0
cdef const_char_ptr detected_charset cdef const_char_ptr detected_charset
@ -70,7 +62,7 @@ cdef class Detector:
cdef int result cdef int result
if not self.done and not self._closed: if not self.done and not self._closed:
length = strlen(msg) length = len(msg)
result = csd_consider(self.csd, msg, length) result = csd_consider(self.csd, msg, length)
if result == -1: # Error, signal with a negative number if result == -1: # Error, signal with a negative number