Skip to content

Commit

Permalink
Fix icc warnings: strlen() returns size_t
Browse files Browse the repository at this point in the history
  • Loading branch information
nnorwitz committed Jan 8, 2006
1 parent 2841af4 commit d39d861
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
9 changes: 5 additions & 4 deletions Modules/zipimport.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static int
zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds)
{
char *path, *p, *prefix, buf[MAXPATHLEN+2];
int len;
size_t len;

if (!_PyArg_NoKeywords("zipimporter()", kwds))
return -1;
Expand Down Expand Up @@ -231,7 +231,7 @@ get_subname(char *fullname)
static int
make_filename(char *prefix, char *name, char *path)
{
int len;
size_t len;
char *p;

len = strlen(prefix);
Expand All @@ -249,7 +249,7 @@ make_filename(char *prefix, char *name, char *path)
*p = SEP;
}
len += strlen(name);
return len;
return (int)len;
}

enum zi_module_info {
Expand Down Expand Up @@ -659,7 +659,8 @@ read_directory(char *archive)
FILE *fp;
long compress, crc, data_size, file_size, file_offset, date, time;
long header_offset, name_size, header_size, header_position;
long i, l, length, count;
long i, l, count;
size_t length;
char path[MAXPATHLEN + 5];
char name[MAXPATHLEN + 5];
char *p, endof_central_dir[22];
Expand Down
5 changes: 2 additions & 3 deletions Python/pystrtod.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ PyOS_ascii_strtod(const char *nptr, char **endptr)
double val = -1.0;
struct lconv *locale_data;
const char *decimal_point;
int decimal_point_len;
size_t decimal_point_len;
const char *p, *decimal_point_pos;
const char *end = NULL; /* Silence gcc */

Expand Down Expand Up @@ -165,9 +165,8 @@ PyOS_ascii_formatd(char *buffer,
{
struct lconv *locale_data;
const char *decimal_point;
int decimal_point_len;
size_t decimal_point_len, rest_len;
char *p;
int rest_len;
char format_char;

/* g_return_val_if_fail (buffer != NULL, NULL); */
Expand Down

0 comments on commit d39d861

Please sign in to comment.