diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-10-25 14:22:43 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-10-25 14:22:43 +0100 |
| commit | 7c8871d31510865e40c8628ef765996202a3cc00 (patch) | |
| tree | 622b7aa085999fe3d2908772ff0d0c6ec5bf4400 /src/udev/ata_id/ata_id.c | |
| parent | 7c257428969aaba2acc4e26753c86d6f4774354a (diff) | |
| parent | f00022dd121c73b543ae667ddce9814bd67a1b73 (diff) | |
Merge pull request #1654 from poettering/util-lib
Various changes to src/basic/
Diffstat (limited to 'src/udev/ata_id/ata_id.c')
| -rw-r--r-- | src/udev/ata_id/ata_id.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c index 1d1798dd10..1e414664ce 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -19,28 +19,30 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <unistd.h> -#include <fcntl.h> #include <ctype.h> -#include <string.h> #include <errno.h> +#include <fcntl.h> #include <getopt.h> +#include <linux/bsg.h> +#include <linux/hdreg.h> #include <scsi/scsi.h> -#include <scsi/sg.h> #include <scsi/scsi_ioctl.h> +#include <scsi/sg.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <sys/ioctl.h> -#include <sys/types.h> #include <sys/stat.h> -#include <linux/hdreg.h> -#include <linux/bsg.h> +#include <sys/types.h> +#include <unistd.h> #include "libudev.h" + +#include "fd-util.h" #include "libudev-private.h" -#include "udev-util.h" #include "log.h" +#include "udev-util.h" #define COMMAND_TIMEOUT_MSEC (30 * 1000) |