emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Removed xalloc type functions from library

Browse Source 
These xalloc functions are a private function for the library. If using
programs need them, then they should make their own error reporting or
use a common file.
This commit is contained in:
Craig Small
2011-12-20 22:56:17 +11:00
parent 562b4a039f
commit 2865ded64e
6 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ps/parser.c
View File

@ -174,10 +174,10 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s
int need_item;
const char *err; /* error code that could or did happen */
/*** prepare to operate ***/
node = xmalloc(sizeof(selection_node));
node->u = xmalloc(strlen(arg)*sizeof(sel_union)); /* waste is insignificant */
node = malloc(sizeof(selection_node));
node->u = malloc(strlen(arg)*sizeof(sel_union)); /* waste is insignificant */
node->n = 0;
buf = xstrdup(arg);
buf = strdup(arg);
/*** sanity check and count items ***/
need_item = 1; /* true */
items = 0;
@ -576,8 +576,8 @@ static const char *parse_bsd_option(void){
/* put our tty on a tiny list */
{
selection_node *node;
node = xmalloc(sizeof(selection_node));
node->u = xmalloc(sizeof(sel_union));
node = malloc(sizeof(selection_node));
node->u = malloc(sizeof(sel_union));
node->u[0].tty = cached_tty;
node->typecode = SEL_TTY;
node->n = 1;
@ -705,8 +705,8 @@ static const char *parse_bsd_option(void){
if(!arg){
/* Wow, obsolete BSD syntax. Put our tty on a tiny list. */
selection_node *node;
node = xmalloc(sizeof(selection_node));
node->u = xmalloc(sizeof(sel_union));
node = malloc(sizeof(selection_node));
node->u = malloc(sizeof(sel_union));
node->u[0].tty = cached_tty;
node->typecode = SEL_TTY;
node->n = 1;
@ -1018,16 +1018,16 @@ static const char *parse_trailing_pids(void){
argp = ps_argv + thisarg;
thisarg = ps_argc - 1; /* we must be at the end now */
pidnode = xmalloc(sizeof(selection_node));
pidnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */
pidnode = malloc(sizeof(selection_node));
pidnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */
pidnode->n = 0;
grpnode = xmalloc(sizeof(selection_node));
grpnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */
grpnode = malloc(sizeof(selection_node));
grpnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */
grpnode->n = 0;
sidnode = xmalloc(sizeof(selection_node));
sidnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */
sidnode = malloc(sizeof(selection_node));
sidnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */
sidnode->n = 0;
while(i--){