RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: popt Date: 04-Nov-2007 14:18:27
Branch: HEAD Handle: 2007110413182700
Modified files:
popt popthelp.c
Log:
- jbj: don't use assert to avoid null clloc(3) return check.
Summary:
Revision Changes Path
1.68 +8 -6 popt/popthelp.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: popt/popthelp.c
============================================================================
$ cvs diff -u -r1.67 -r1.68 popthelp.c
--- popt/popthelp.c 4 Nov 2007 13:15:32 -0000 1.67
+++ popt/popthelp.c 4 Nov 2007 13:18:27 -0000 1.68
@@ -615,11 +615,12 @@
else
fprintf(fp, " %s\n", POPT_("[OPTION...]"));
-assert(columns);
- columns->cur = maxArgWidth(con->options, NULL);
- columns->max = maxColumnWidth(fp);
- singleTableHelp(con, fp, con->options, columns, NULL);
- free(columns);
+ if (columns) {
+ columns->cur = maxArgWidth(con->options, NULL);
+ columns->max = maxColumnWidth(fp);
+ singleTableHelp(con, fp, con->options, columns, NULL);
+ free(columns);
+ }
}
/**
@@ -836,7 +837,7 @@
memset(done, 0, sizeof(*done));
done->nopts = 0;
done->maxopts = 64;
-assert(columns);
+ if (columns) {
columns->cur = done->maxopts * sizeof(*done->opts);
columns->max = maxColumnWidth(fp);
done->opts = calloc(1, columns->cur);
@@ -859,6 +860,7 @@
fprintf(fp, "\n");
free(done->opts);
free(columns);
+ }
}
void poptSetOtherOptionHelp(poptContext con, const char * text)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
