diff options
Diffstat (limited to 'libidu')
| -rw-r--r-- | libidu/idfile.c | 7 | ||||
| -rw-r--r-- | libidu/scanners.c | 8 | ||||
| -rw-r--r-- | libidu/scanners.h | 4 | ||||
| -rw-r--r-- | libidu/walker.c | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/libidu/idfile.c b/libidu/idfile.c index 5ba9f11..20b9d55 100644 --- a/libidu/idfile.c +++ b/libidu/idfile.c @@ -22,12 +22,13 @@ #include <errno.h> #include <stdlib.h> #include <string.h> -#include "lstat.h" #include <obstack.h> #include <error.h> -#include "xnls.h" #include "idfile.h" +#include "lstat.h" +#include "xalloc.h" +#include "xnls.h" int io_size (FILE *, void *, unsigned int size, int); @@ -53,7 +54,7 @@ locate_id_file_name (char const *arg) id_path = getenv ("IDPATH"); if (id_path) { - id_path = strdup (id_path); + id_path = xstrdup (id_path); arg = strsep (&id_path, ":"); /* FIXME: handle multiple ID file names */ } diff --git a/libidu/scanners.c b/libidu/scanners.c index cac4f56..c29b649 100644 --- a/libidu/scanners.c +++ b/libidu/scanners.c @@ -477,7 +477,7 @@ parse_args_c (char **argv, int argc) args = &args_c; else { - tmp_string = strdup (*argv); + tmp_string = xstrdup (*argv); tokenize_args_string (tmp_string, &argc, &argv); args = xmalloc (sizeof(struct args_c) * 1); args->strip_underscore = 0; @@ -868,7 +868,7 @@ parse_args_asm (char **argv, int argc) args = &args_asm; else { - tmp_string = strdup (*argv); + tmp_string = xstrdup (*argv); tokenize_args_string (tmp_string, &argc, &argv); args = xmalloc (sizeof(struct args_asm) * 1); args->strip_underscore = 0; @@ -1136,7 +1136,7 @@ parse_args_text (char **argv, int argc) args = &args_text; else { - tmp_string = strdup (*argv); + tmp_string = xstrdup (*argv); tokenize_args_string (tmp_string, &argc, &argv); args = xmalloc (sizeof(struct args_text) * 1); args->ctype = ctype_text; @@ -1342,7 +1342,7 @@ parse_args_perl (char **argv, int argc) args = &args_perl; else { - tmp_string = strdup (*argv); + tmp_string = xstrdup (*argv); tokenize_args_string (tmp_string, &argc, &argv); args = xmalloc (sizeof(struct args_perl)); args->exclude_dtags = 1; diff --git a/libidu/scanners.h b/libidu/scanners.h index c30e95f..68c357b 100644 --- a/libidu/scanners.h +++ b/libidu/scanners.h @@ -1,5 +1,5 @@ /* scanners.h -- defs for interface to scanners.c - Copyright (C) 1986, 1995, 1996, 1999, 2007 Free Software Foundation, Inc. + Copyright (C) 1986, 1995, 1996, 1999, 2007-2008 Free Software Foundation, Inc. Written by Greg McGary <gkm@gnu.ai.mit.edu> This program is free software; you can redistribute it and/or modify @@ -32,7 +32,7 @@ struct token }; #define TOKEN_HITS(TOKEN) ((TOKEN)->tok_hits_name) -#define TOKEN_NAME(TOKEN) ((TOKEN)->tok_hits_name + log_8_member_files) +#define TOKEN_NAME(TOKEN) (char *)((TOKEN)->tok_hits_name + log_8_member_files) #define OFFSETOF_TOKEN_NAME (offsetof (struct token, tok_hits_name) + log_8_member_files) typedef struct token *(*get_token_func_t) (FILE *in_FILE, void const *args, int *flags); diff --git a/libidu/walker.c b/libidu/walker.c index 7111733..30f826e 100644 --- a/libidu/walker.c +++ b/libidu/walker.c @@ -608,7 +608,7 @@ get_current_dir_link (void) cwd_0 = getenv ("PWD"); if (cwd_0) - cwd_0 = strdup (cwd_0); + cwd_0 = xstrdup (cwd_0); if (!same_as_dot (cwd_0)) cwd_0 = xcwd = xgetcwd (); if (cwd_0 == 0) |