← Back to branch summary

~ubuntu-branches/ubuntu/precise/iptables/precise-updates

« back to all changes in this revision

Viewing changes to iptables-restore.c

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-07-14 15:59:54 UTC
  • mfrom: (5.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090714155954-9039kro8cnh6lb1q
Tags: 1.4.4-1ubuntu1
https://launchpad.net/bugs/399211
* Merge from debian unstable, remaining changes: LP: #399211
  - Don't fail to run iptables-save if iptables module isn't loaded.
  - debian/patches/0901-build-libipq_pic.a.patch - Build libipq_pic.a with
    -fPIC. Upstream changed build system and patch modified accordingly.
  - Revert changes between 1.4.1.1-3 and 1.4.1.1-4, thus bringing back
    the howtos.
  - Added linuxdoc-tools to Build-Depends
  - Modified debian/iptables{,-dev}.install to match DM syntax
    (removed debian/tmp)

Show diffs side-by-side

added added

removed removed

Lines of Context:
iptables-restore.c
99
99
 * returns true if argument added, false otherwise */
100
100
static int add_argv(char *what) {
101
101
        DEBUGP("add_argv: %s\n", what);
102
 
        if (what && ((newargc + 1) < sizeof(newargv)/sizeof(char *))) {
 
102
        if (what && newargc + 1 < ARRAY_SIZE(newargv)) {
103
103
                newargv[newargc] = strdup(what);
104
104
                newargc++;
105
105
                return 1;
459
459
                exit(1);
460
460
        }
461
461
 
 
462
        if (in != NULL)
 
463
                fclose(in);
462
464
        return 0;
463
465
}