Replace CArray by CPointer (#406)

Also do some cleanup.
This commit is contained in:
SvyatoslavScherbina
2017-03-28 17:44:08 +03:00
committed by Nikolay Igotti
parent e36b5d3476
commit c1d9dc1cbb
17 changed files with 176 additions and 143 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ fun main(args: Array<String>) {
val buffer = allocArray<CInt8Var>(bufferLength)
for (i in 1..count) {
val nextLine = fgets(buffer[0].ptr, bufferLength, file)?.toKString()
val nextLine = fgets(buffer, bufferLength, file)?.toKString()
if (nextLine == null || nextLine.isEmpty()) break
val records = parseLine(nextLine, ',')
@@ -22,7 +22,7 @@ class GitRepository(val location: String) {
val size = remoteList.count.value.toInt()
val list = ArrayList<GitRemote>(size)
for (index in 0..size - 1) {
val array = remoteList.strings.value!!.reinterpret<CArray<CPointerVar<CInt8Var>>>().pointed
val array = remoteList.strings.value!!
val name = array[index].value!!.toKString()
val remotePtr = allocPointerTo<git_remote>()
git_remote_lookup(remotePtr.ptr, handle, name).errorCheck()
+2 -2
View File
@@ -35,14 +35,14 @@ fun main(args: Array<String>) {
.ensureUnixCallResult { it >= 0 }
while (true) {
val length = read(commFd, buffer.ptr, bufferLength)
val length = read(commFd, buffer, bufferLength)
.ensureUnixCallResult { it >= 0 }
if (length == 0L) {
break
}
write(commFd, buffer.ptr, length)
write(commFd, buffer, length)
.ensureUnixCallResult { it >= 0 }
}
}