Skip to content

Commit 9d45fdf

Browse files
manuelblmanuelbl
committed
Linux: latest jextract, no import cleanup
1 parent 88f3846 commit 9d45fdf

17 files changed

Lines changed: 141 additions & 219 deletions

‎java-does-usb/jextract/linux/gen_linux.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
JEXTRACT=../../../../jextract/build/jextract/bin/jextract
3+
JEXTRACT=../../../../jextract/bin/jextract
44

55
# errno.h
66
$JEXTRACT --output ../../src/main/java \

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/epoll/epoll.java‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
package net.codecrete.usb.linux.gen.epoll;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.FunctionDescriptor;
8-
import java.lang.foreign.GroupLayout;
9-
import java.lang.foreign.Linker;
10-
import java.lang.foreign.MemoryLayout;
11-
import java.lang.foreign.MemorySegment;
12-
import java.lang.foreign.PaddingLayout;
13-
import java.lang.foreign.SequenceLayout;
14-
import java.lang.foreign.StructLayout;
15-
import java.lang.foreign.SymbolLookup;
16-
import java.lang.foreign.ValueLayout;
17-
import java.lang.invoke.MethodHandle;
18-
import java.lang.invoke.MethodHandles;
19-
import java.util.Arrays;
20-
import java.util.stream.Collectors;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
2111

22-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
2314

2415
public class epoll {
2516

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/epoll/epoll_data.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22

33
package net.codecrete.usb.linux.gen.epoll;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.GroupLayout;
8-
import java.lang.foreign.MemoryLayout;
9-
import java.lang.foreign.MemorySegment;
10-
import java.lang.foreign.SegmentAllocator;
11-
import java.util.function.Consumer;
12-
13-
import static java.lang.foreign.MemoryLayout.PathElement.groupElement;
14-
import static java.lang.foreign.ValueLayout.OfInt;
15-
import static java.lang.foreign.ValueLayout.OfLong;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
1614

1715
/**
1816
* {@snippet lang=c :

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/epoll/epoll_event.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
package net.codecrete.usb.linux.gen.epoll;
44

5-
import java.lang.foreign.Arena;
6-
import java.lang.foreign.GroupLayout;
7-
import java.lang.foreign.MemoryLayout;
8-
import java.lang.foreign.MemorySegment;
9-
import java.lang.foreign.SegmentAllocator;
10-
import java.util.function.Consumer;
11-
12-
import static java.lang.foreign.MemoryLayout.PathElement.groupElement;
13-
import static java.lang.foreign.ValueLayout.OfInt;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
1414

1515
/**
1616
* {@snippet lang=c :

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/errno/errno.java‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
package net.codecrete.usb.linux.gen.errno;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.FunctionDescriptor;
8-
import java.lang.foreign.GroupLayout;
9-
import java.lang.foreign.Linker;
10-
import java.lang.foreign.MemoryLayout;
11-
import java.lang.foreign.MemorySegment;
12-
import java.lang.foreign.PaddingLayout;
13-
import java.lang.foreign.SequenceLayout;
14-
import java.lang.foreign.StructLayout;
15-
import java.lang.foreign.SymbolLookup;
16-
import java.lang.foreign.ValueLayout;
17-
import java.lang.invoke.MethodHandle;
18-
import java.lang.invoke.MethodHandles;
19-
import java.util.Arrays;
20-
import java.util.stream.Collectors;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
2111

22-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
2314

2415
public class errno {
2516

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/fcntl/fcntl.java‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
package net.codecrete.usb.linux.gen.fcntl;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.FunctionDescriptor;
8-
import java.lang.foreign.GroupLayout;
9-
import java.lang.foreign.Linker;
10-
import java.lang.foreign.MemoryLayout;
11-
import java.lang.foreign.MemorySegment;
12-
import java.lang.foreign.PaddingLayout;
13-
import java.lang.foreign.SequenceLayout;
14-
import java.lang.foreign.StructLayout;
15-
import java.lang.foreign.SymbolLookup;
16-
import java.lang.foreign.ValueLayout;
17-
import java.lang.invoke.MethodHandle;
18-
import java.lang.invoke.MethodHandles;
19-
import java.util.Arrays;
20-
import java.util.stream.Collectors;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
2111

22-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
2314

2415
public class fcntl {
2516

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/string/string.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
package net.codecrete.usb.linux.gen.string;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.FunctionDescriptor;
8-
import java.lang.foreign.GroupLayout;
9-
import java.lang.foreign.Linker;
10-
import java.lang.foreign.MemoryLayout;
11-
import java.lang.foreign.MemorySegment;
12-
import java.lang.foreign.PaddingLayout;
13-
import java.lang.foreign.SequenceLayout;
14-
import java.lang.foreign.StructLayout;
15-
import java.lang.foreign.SymbolLookup;
16-
import java.lang.foreign.ValueLayout;
17-
import java.lang.invoke.MethodHandle;
18-
import java.lang.invoke.MethodHandles;
19-
import java.util.Arrays;
20-
import java.util.stream.Collectors;
21-
22-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
2314

2415
public class string {
2516

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/udev/udev.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
package net.codecrete.usb.linux.gen.udev;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.FunctionDescriptor;
8-
import java.lang.foreign.GroupLayout;
9-
import java.lang.foreign.Linker;
10-
import java.lang.foreign.MemoryLayout;
11-
import java.lang.foreign.MemorySegment;
12-
import java.lang.foreign.PaddingLayout;
13-
import java.lang.foreign.SequenceLayout;
14-
import java.lang.foreign.StructLayout;
15-
import java.lang.foreign.SymbolLookup;
16-
import java.lang.foreign.ValueLayout;
17-
import java.lang.invoke.MethodHandle;
18-
import java.lang.invoke.MethodHandles;
19-
import java.util.Arrays;
20-
import java.util.stream.Collectors;
21-
22-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
2314

2415
public class udev {
2516

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/unistd/unistd.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
package net.codecrete.usb.linux.gen.unistd;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.FunctionDescriptor;
8-
import java.lang.foreign.GroupLayout;
9-
import java.lang.foreign.Linker;
10-
import java.lang.foreign.MemoryLayout;
11-
import java.lang.foreign.MemorySegment;
12-
import java.lang.foreign.PaddingLayout;
13-
import java.lang.foreign.SequenceLayout;
14-
import java.lang.foreign.StructLayout;
15-
import java.lang.foreign.SymbolLookup;
16-
import java.lang.foreign.ValueLayout;
17-
import java.lang.invoke.MethodHandle;
18-
import java.lang.invoke.MethodHandles;
19-
import java.util.Arrays;
20-
import java.util.stream.Collectors;
21-
22-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
2314

2415
public class unistd {
2516

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/usbdevice_fs/usbdevfs_bulktransfer.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
package net.codecrete.usb.linux.gen.usbdevice_fs;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.GroupLayout;
8-
import java.lang.foreign.MemoryLayout;
9-
import java.lang.foreign.MemorySegment;
10-
import java.lang.foreign.SegmentAllocator;
11-
import java.util.function.Consumer;
12-
13-
import static java.lang.foreign.MemoryLayout.PathElement.groupElement;
14-
import static java.lang.foreign.ValueLayout.OfInt;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
1514

1615
/**
1716
* {@snippet lang=c :

0 commit comments

Comments
 (0)