From: Karel Zak <kzak@redhat.com>
Date: Tue, 2 Aug 2016 13:26:49 +0000 (+0200)
Subject: Merge branch 'oclint' of git://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.29-rc1~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e948ac218b93174d0e59e622b75b3aa3592ac876;p=thirdparty%2Futil-linux.git

Merge branch 'oclint' of git://github.com/kerolasa/lelux-utiliteetit

* 'oclint' of git://github.com/kerolasa/lelux-utiliteetit:
  libblkid: fix debugging macro [oclint]
  agetty: move unreachable code to pre-processor #else segment [oclint]
  setterm: fix declarations shadowing variables in the global scope [oclint]
  misc: fix declarations shadowing variables in the global scope [oclint]
  dmesg: drop core at impossible case in read_buffer() [oclint]
  libmount, look: remove dead code [oclint]
  syspriv: flip inverted logic [oclint]
  logger: simplify if clause [oclint]
  libblkid: simplify if clause [oclint]
  lslogins: simplify if clause and move definition and comments [oclint]
  switch_root: simplify code and reduce indentation [oclint]
  misc: simplify if clauses [oclint]
---

e948ac218b93174d0e59e622b75b3aa3592ac876