← Back to branch summary

~ubuntu-branches/ubuntu/precise/net-snmp/precise

« back to all changes in this revision

Viewing changes to agent/helpers/table_iterator.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-11-26 01:27:00 UTC
  • mfrom: (1.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091126012700-pox7w0a5j2x305h9
Tags: 5.4.2.1~dfsg-3ubuntu1
https://launchpad.net/bugs/104738
https://launchpad.net/bugs/254261
https://launchpad.net/bugs/250459
https://launchpad.net/bugs/426813
* Merge from debian testing.  Remaining changes:
  - Set Ubuntu maintainer address.
  - net-snmp-config: Use bash. (LP: #104738)
  - Removed multiuser option when calling update-rc.d. (LP: #254261)
  - debian/snmpd.init: LSBify the init script.
  - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcmd.1
    (LP: #250459)
  - debian/patches/99-fix-ubuntu-div0.patch: Fix dvision by zero.
    (LP: #426813).
 * Dropped patches:
   - debian/patches/101-fix-ipalias.patch: Applied upstream.
   - debian/patches/99-fix-net-snmp-syslog.patch: Applied upstream.
   - debian/patches/99-fix-perl-counter-in-subagent.patch: Applied upstream.
   - ebian/patches/103-fix-ubuntu-lmsensors.patch: No longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/helpers/table_iterator.c
392
392
    int             oldmode = 0;
393
393
    netsnmp_iterator_info *iinfo;
394
394
    int notdone;
 
395
    int hintok = 0;
395
396
    netsnmp_request_info *request, *reqtmp = NULL;
396
397
    netsnmp_variable_list *index_search = NULL;
397
398
    netsnmp_variable_list *free_this_index_search = NULL;
493
494
          if (!request->processed)
494
495
            request_count++;
495
496
        notdone = 1;
 
497
        hintok = 1;
496
498
        while(notdone) {
497
499
            notdone = 0;
498
500
 
534
536
            }
535
537
 
536
538
            /* if sorted, pass in a hint */
537
 
            if (iinfo->flags & NETSNMP_ITERATOR_FLAG_SORTED) {
 
539
            if (hintok && (iinfo->flags & NETSNMP_ITERATOR_FLAG_SORTED)) {
538
540
                callback_loop_context = table_info;
539
541
            }
540
542
            index_search =
710
712
                            break;
711
713
                        } else {
712
714
                          table_info->colnum = nc;
713
 
                            notdone = 1;
 
715
                          hintok = 0;
 
716
                          notdone = 1;
714
717
                        }
715
718
                    }
716
719
                }