Merge pull request #4 from bnema/fix/callback-trampoline
feat(glib): implement trampoline pattern for source callbacks
59 files · +941 -194
M templates/glib +150 -0
| @@ -187,6 +187,152 @@ func RemoveCallbackBySource(sourceID uint) { | |||
| 187 | 187 | callbacks.Unlock() | |
| 188 | 188 | } | |
| 189 | 189 | ||
| 190 | + | // --------------------------------------------------------------------------- | |
| 191 | + | // Source callback trampoline | |
| 192 | + | // | |
| 193 | + | // GLib source functions (IdleAdd, TimeoutAdd, etc.) previously allocated a new | |
| 194 | + | // purego callback slot for every invocation. purego has a hard limit of 2000 | |
| 195 | + | // slots, so long-running programs that schedule many one-shot idle/timeout | |
| 196 | + | // callbacks would exhaust the pool and panic. | |
| 197 | + | // | |
| 198 | + | // The trampoline uses a single purego callback that dispatches through a | |
| 199 | + | // Go-side map keyed by an opaque ID passed as GLib's user_data pointer. | |
| 200 | + | // This means all IdleAdd/TimeoutAdd calls share ONE purego slot regardless | |
| 201 | + | // of how many are outstanding. | |
| 202 | + | // --------------------------------------------------------------------------- | |
| 203 | + | ||
| 204 | + | // sourceEntry holds a registered GLib source callback. | |
| 205 | + | type sourceEntry struct { | |
| 206 | + | fn SourceFunc | |
| 207 | + | once bool // if true, automatically remove after first call (SourceOnceFunc semantics) | |
| 208 | + | } | |
| 209 | + | ||
| 210 | + | var sourceTrampolines = struct { | |
| 211 | + | sync.Mutex | |
| 212 | + | nextID uintptr | |
| 213 | + | funcs map[uintptr]*sourceEntry | |
| 214 | + | sourceToDataID map[uint]uintptr // GLib source ID → trampoline data ID | |
| 215 | + | }{ | |
| 216 | + | funcs: make(map[uintptr]*sourceEntry), | |
| 217 | + | sourceToDataID: make(map[uint]uintptr), | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | // sourceTrampolineCb is the single purego callback shared by all source functions. | |
| 221 | + | // GLib calls it with the user_data we provided (our map key). | |
| 222 | + | var sourceTrampolineCb uintptr | |
| 223 | + | ||
| 224 | + | // sourceTrampolineOnceCb is the single purego callback for SourceOnceFunc sources | |
| 225 | + | // (IdleAddOnce, TimeoutAddOnce). These have signature func(uintptr) with no return. | |
| 226 | + | var sourceTrampolineOnceCb uintptr | |
| 227 | + | ||
| 228 | + | func initSourceTrampoline() { | |
| 229 | + | fn := func(id uintptr) uintptr { | |
| 230 | + | sourceTrampolines.Lock() | |
| 231 | + | entry, ok := sourceTrampolines.funcs[id] | |
| 232 | + | if !ok { | |
| 233 | + | sourceTrampolines.Unlock() | |
| 234 | + | return 0 // SOURCE_REMOVE — entry already cleaned up (e.g. by SourceRemove) | |
| 235 | + | } | |
| 236 | + | cb := entry.fn | |
| 237 | + | sourceTrampolines.Unlock() | |
| 238 | + | ||
| 239 | + | result := cb(0) | |
| 240 | + | ||
| 241 | + | if !result { | |
| 242 | + | sourceTrampolines.Lock() | |
| 243 | + | delete(sourceTrampolines.funcs, id) | |
| 244 | + | // Also clean up the reverse mapping (source ID → data ID). | |
| 245 | + | for sid, did := range sourceTrampolines.sourceToDataID { | |
| 246 | + | if did == id { | |
| 247 | + | delete(sourceTrampolines.sourceToDataID, sid) | |
| 248 | + | break | |
| 249 | + | } | |
| 250 | + | } | |
| 251 | + | sourceTrampolines.Unlock() | |
| 252 | + | } | |
| 253 | + | if result { | |
| 254 | + | return 1 | |
| 255 | + | } | |
| 256 | + | return 0 | |
| 257 | + | } | |
| 258 | + | sourceTrampolineCb = purego.NewCallback(fn) | |
| 259 | + | ||
| 260 | + | onceFn := func(id uintptr) { | |
| 261 | + | sourceTrampolines.Lock() | |
| 262 | + | entry, ok := sourceTrampolines.funcs[id] | |
| 263 | + | if !ok { | |
| 264 | + | sourceTrampolines.Unlock() | |
| 265 | + | return | |
| 266 | + | } | |
| 267 | + | cb := entry.fn | |
| 268 | + | delete(sourceTrampolines.funcs, id) | |
| 269 | + | // Also clean up the reverse mapping. | |
| 270 | + | for sid, did := range sourceTrampolines.sourceToDataID { | |
| 271 | + | if did == id { | |
| 272 | + | delete(sourceTrampolines.sourceToDataID, sid) | |
| 273 | + | break | |
| 274 | + | } | |
| 275 | + | } | |
| 276 | + | sourceTrampolines.Unlock() | |
| 277 | + | ||
| 278 | + | cb(0) | |
| 279 | + | } | |
| 280 | + | sourceTrampolineOnceCb = purego.NewCallback(onceFn) | |
| 281 | + | } | |
| 282 | + | ||
| 283 | + | // registerSourceFunc stores a SourceFunc in the trampoline map and returns | |
| 284 | + | // the trampoline callback pointer and the user_data key. | |
| 285 | + | func registerSourceFunc(fn *SourceFunc, once bool) (trampolineCb uintptr, userData uintptr) { | |
| 286 | + | if fn == nil { | |
| 287 | + | return 0, 0 | |
| 288 | + | } | |
| 289 | + | sourceTrampolines.Lock() | |
| 290 | + | sourceTrampolines.nextID++ | |
| 291 | + | id := sourceTrampolines.nextID | |
| 292 | + | sourceTrampolines.funcs[id] = &sourceEntry{fn: *fn, once: once} | |
| 293 | + | sourceTrampolines.Unlock() | |
| 294 | + | if once { | |
| 295 | + | return sourceTrampolineOnceCb, id | |
| 296 | + | } | |
| 297 | + | return sourceTrampolineCb, id | |
| 298 | + | } | |
| 299 | + | ||
| 300 | + | // registerSourceOnceFunc stores a SourceOnceFunc in the trampoline map and | |
| 301 | + | // returns the trampoline callback pointer and the user_data key. | |
| 302 | + | func registerSourceOnceFunc(fn *SourceOnceFunc) (trampolineCb uintptr, userData uintptr) { | |
| 303 | + | if fn == nil { | |
| 304 | + | return 0, 0 | |
| 305 | + | } | |
| 306 | + | // Wrap SourceOnceFunc as SourceFunc so the entry type is uniform. | |
| 307 | + | wrapped := SourceFunc(func(data uintptr) bool { | |
| 308 | + | (*fn)(data) | |
| 309 | + | return false | |
| 310 | + | }) | |
| 311 | + | return registerSourceFunc(&wrapped, true) | |
| 312 | + | } | |
| 313 | + | ||
| 314 | + | // saveSourceTrampolineMapping records the GLib source ID → trampoline data ID | |
| 315 | + | // mapping so that SourceRemove can clean up the trampoline entry. | |
| 316 | + | func saveSourceTrampolineMapping(sourceID uint, dataID uintptr) { | |
| 317 | + | if sourceID == 0 { | |
| 318 | + | return | |
| 319 | + | } | |
| 320 | + | sourceTrampolines.Lock() | |
| 321 | + | sourceTrampolines.sourceToDataID[sourceID] = dataID | |
| 322 | + | sourceTrampolines.Unlock() | |
| 323 | + | } | |
| 324 | + | ||
| 325 | + | // removeSourceTrampolineBySourceID cleans up trampoline state when a GLib | |
| 326 | + | // source is removed via SourceRemove (before the callback fires). | |
| 327 | + | func removeSourceTrampolineBySourceID(sourceID uint) { | |
| 328 | + | sourceTrampolines.Lock() | |
| 329 | + | if dataID, ok := sourceTrampolines.sourceToDataID[sourceID]; ok { | |
| 330 | + | delete(sourceTrampolines.sourceToDataID, sourceID) | |
| 331 | + | delete(sourceTrampolines.funcs, dataID) | |
| 332 | + | } | |
| 333 | + | sourceTrampolines.Unlock() | |
| 334 | + | } | |
| 335 | + | ||
| 190 | 336 | // UnrefCallbackValue unreferences the provided callback by reflect.value to free a purego slot | |
| 191 | 337 | // | |
| 192 | 338 | // NOTE: Windows does not support unreferencing callbacks, so on that platform this operation is | |
| @@ -211,6 +357,10 @@ func NewCallbackNullable(fn interface{}) uintptr { | |||
| 211 | 357 | return NewCallback(fn) | |
| 212 | 358 | } | |
| 213 | 359 | ||
| 360 | + | func init() { | |
| 361 | + | initSourceTrampoline() | |
| 362 | + | } | |
| 363 | + | ||
| 214 | 364 | func (e *Error) Error() string { | |
| 215 | 365 | return fmt.Sprintf("Gtk reported an error with message: '%s', domain: '%v' and code: '%v'", e.MessageGo(), e.Domain, e.Code) | |
| 216 | 366 | } | |
M templates/go +48 -5
| @@ -289,23 +289,65 @@ const ( | |||
| 289 | 289 | {{end}} | |
| 290 | 290 | ||
| 291 | 291 | {{- define "glib_source_mapping_post_hook" -}} | |
| 292 | - | {{- if or (eq .Name "ChildWatchAdd") (eq .Name "ChildWatchAddFull") (eq .Name "IdleAdd") (eq .Name "IdleAddFull") (eq .Name "IdleAddOnce") (eq .Name "TimeoutAdd") (eq .Name "TimeoutAddFull") (eq .Name "TimeoutAddOnce") (eq .Name "TimeoutAddSeconds") (eq .Name "TimeoutAddSecondsFull") (eq .Name "TimeoutAddSecondsOnce")}} | |
| 293 | - | if FunctionVar != nil { | |
| 294 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 295 | - | } | |
| 296 | - | {{- end}} | |
| 297 | 292 | {{- if eq .Name "SourceRemove"}} | |
| 298 | 293 | if cret { | |
| 299 | 294 | RemoveCallbackBySource(TagVar) | |
| 295 | + | removeSourceTrampolineBySourceID(TagVar) | |
| 300 | 296 | } | |
| 301 | 297 | {{- end}} | |
| 302 | 298 | {{- end}} | |
| 303 | 299 | ||
| 300 | + | {{- /* glib_source_trampoline_body emits the entire function body for IdleAdd/TimeoutAdd | |
| 301 | + | family functions. These use a shared purego trampoline callback instead of allocating | |
| 302 | + | a new purego callback slot per call. */ -}} | |
| 303 | + | {{- /* glib_source_trampoline_body emits the entire function body for IdleAdd/TimeoutAdd | |
| 304 | + | family functions. These use a shared purego trampoline callback instead of allocating | |
| 305 | + | a new purego callback slot per call. */ -}} | |
| 306 | + | {{- define "glib_source_trampoline_body" -}} | |
| 307 | + | {{- if or (eq .Name "IdleAdd") (eq .Name "TimeoutAdd") (eq .Name "TimeoutAddSeconds") -}} | |
| 308 | + | trampolineCb, userData := registerSourceFunc(FunctionVar, false) | |
| 309 | + | cret := x{{.Name}}({{- if or (eq .Name "TimeoutAdd") (eq .Name "TimeoutAddSeconds") -}}IntervalVar, {{end}}trampolineCb, userData) | |
| 310 | + | saveSourceTrampolineMapping(cret, userData) | |
| 311 | + | return cret | |
| 312 | + | {{- else if or (eq .Name "IdleAddOnce") (eq .Name "TimeoutAddOnce") (eq .Name "TimeoutAddSecondsOnce") -}} | |
| 313 | + | trampolineCb, userData := registerSourceOnceFunc(FunctionVar) | |
| 314 | + | cret := x{{.Name}}({{- if or (eq .Name "TimeoutAddOnce") (eq .Name "TimeoutAddSecondsOnce") -}}IntervalVar, {{end}}trampolineCb, userData) | |
| 315 | + | saveSourceTrampolineMapping(cret, userData) | |
| 316 | + | return cret | |
| 317 | + | {{- else if or (eq .Name "IdleAddFull") (eq .Name "TimeoutAddFull") (eq .Name "TimeoutAddSecondsFull") -}} | |
| 318 | + | trampolineCb, userData := registerSourceFunc(FunctionVar, false) | |
| 319 | + | {{range .Args.Callbacks -}} | |
| 320 | + | {{- if eq .Name "NotifyVar" -}} | |
| 321 | + | var {{.Name}}Ref uintptr | |
| 322 | + | if {{.Name}} != nil { | |
| 323 | + | {{.Name}}Ptr := uintptr(unsafe.Pointer({{.Name}})) | |
| 324 | + | if cbRefPtr, ok := GetCallback({{.Name}}Ptr); ok { | |
| 325 | + | {{.Name}}Ref = cbRefPtr | |
| 326 | + | } else { | |
| 327 | + | fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} { | |
| 328 | + | cbFn := *{{.Name}} | |
| 329 | + | {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}}) | |
| 330 | + | } | |
| 331 | + | {{.Name}}Ref = purego.NewCallback(fcb) | |
| 332 | + | SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}}) | |
| 333 | + | } | |
| 334 | + | } | |
| 335 | + | {{- end}} | |
| 336 | + | {{- end}} | |
| 337 | + | cret := x{{.Name}}(PriorityVar, {{- if or (eq .Name "TimeoutAddFull") (eq .Name "TimeoutAddSecondsFull") -}}IntervalVar, {{end}}trampolineCb, userData, NotifyVarRef) | |
| 338 | + | saveSourceTrampolineMapping(cret, userData) | |
| 339 | + | return cret | |
| 340 | + | {{- end}} | |
| 341 | + | {{- end}} | |
| 342 | + | ||
| 304 | 343 | {{range .Functions -}} | |
| 305 | 344 | var x{{.Name}} func({{conv .Args.Pure.Types}}) {{.Ret.Raw}} | |
| 306 | 345 | ||
| 307 | 346 | {{.Doc}} | |
| 308 | 347 | func {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} { | |
| 348 | + | {{- if and (not $NotGLib) (or (eq .Name "IdleAdd") (eq .Name "IdleAddFull") (eq .Name "IdleAddOnce") (eq .Name "TimeoutAdd") (eq .Name "TimeoutAddFull") (eq .Name "TimeoutAddOnce") (eq .Name "TimeoutAddSeconds") (eq .Name "TimeoutAddSecondsFull") (eq .Name "TimeoutAddSecondsOnce"))}} | |
| 349 | + | {{template "glib_source_trampoline_body" .}} | |
| 350 | + | {{- else}} | |
| 309 | 351 | {{.Ret.Preamble $NotGLib}} | |
| 310 | 352 | {{range .Args.Callbacks}} | |
| 311 | 353 | var {{.Name}}Ref uintptr | |
| @@ -332,6 +374,7 @@ func {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} { | |||
| 332 | 374 | {{template "glib_source_mapping_post_hook" .}} | |
| 333 | 375 | {{- end}} | |
| 334 | 376 | {{.Ret.Fmt $NotGObject}} | |
| 377 | + | {{- end}} | |
| 335 | 378 | } | |
| 336 | 379 | {{end}} | |
| 337 | 380 | ||
M v4/glib/garray.go +21 -0
| @@ -387,6 +387,7 @@ var xArrayNewTake func(uintptr, uint, bool, uint) uintptr | |||
| 387 | 387 | func ArrayNewTake(DataVar uintptr, LenVar uint, ClearVar bool, ElementSizeVar uint) uintptr { | |
| 388 | 388 | ||
| 389 | 389 | cret := xArrayNewTake(DataVar, LenVar, ClearVar, ElementSizeVar) | |
| 390 | + | ||
| 390 | 391 | return cret | |
| 391 | 392 | } | |
| 392 | 393 | ||
| @@ -414,6 +415,7 @@ var xArrayNewTakeZeroTerminated func(uintptr, bool, uint) uintptr | |||
| 414 | 415 | func ArrayNewTakeZeroTerminated(DataVar uintptr, ClearVar bool, ElementSizeVar uint) uintptr { | |
| 415 | 416 | ||
| 416 | 417 | cret := xArrayNewTakeZeroTerminated(DataVar, ClearVar, ElementSizeVar) | |
| 418 | + | ||
| 417 | 419 | return cret | |
| 418 | 420 | } | |
| 419 | 421 | ||
| @@ -424,6 +426,7 @@ var xByteArrayAppend func([]byte, []byte, uint) uintptr | |||
| 424 | 426 | func ByteArrayAppend(ArrayVar []byte, DataVar []byte, LenVar uint) uintptr { | |
| 425 | 427 | ||
| 426 | 428 | cret := xByteArrayAppend(ArrayVar, DataVar, LenVar) | |
| 429 | + | ||
| 427 | 430 | return cret | |
| 428 | 431 | } | |
| 429 | 432 | ||
| @@ -436,6 +439,7 @@ var xByteArrayFree func([]byte, bool) uintptr | |||
| 436 | 439 | func ByteArrayFree(ArrayVar []byte, FreeSegmentVar bool) uintptr { | |
| 437 | 440 | ||
| 438 | 441 | cret := xByteArrayFree(ArrayVar, FreeSegmentVar) | |
| 442 | + | ||
| 439 | 443 | return cret | |
| 440 | 444 | } | |
| 441 | 445 | ||
| @@ -453,6 +457,7 @@ var xByteArrayFreeToBytes func([]byte) *Bytes | |||
| 453 | 457 | func ByteArrayFreeToBytes(ArrayVar []byte) *Bytes { | |
| 454 | 458 | ||
| 455 | 459 | cret := xByteArrayFreeToBytes(ArrayVar) | |
| 460 | + | ||
| 456 | 461 | return cret | |
| 457 | 462 | } | |
| 458 | 463 | ||
| @@ -462,6 +467,7 @@ var xByteArrayNew func() uintptr | |||
| 462 | 467 | func ByteArrayNew() uintptr { | |
| 463 | 468 | ||
| 464 | 469 | cret := xByteArrayNew() | |
| 470 | + | ||
| 465 | 471 | return cret | |
| 466 | 472 | } | |
| 467 | 473 | ||
| @@ -478,6 +484,7 @@ var xByteArrayNewTake func([]byte, uint) uintptr | |||
| 478 | 484 | func ByteArrayNewTake(DataVar []byte, LenVar uint) uintptr { | |
| 479 | 485 | ||
| 480 | 486 | cret := xByteArrayNewTake(DataVar, LenVar) | |
| 487 | + | ||
| 481 | 488 | return cret | |
| 482 | 489 | } | |
| 483 | 490 | ||
| @@ -488,6 +495,7 @@ var xByteArrayPrepend func([]byte, []byte, uint) uintptr | |||
| 488 | 495 | func ByteArrayPrepend(ArrayVar []byte, DataVar []byte, LenVar uint) uintptr { | |
| 489 | 496 | ||
| 490 | 497 | cret := xByteArrayPrepend(ArrayVar, DataVar, LenVar) | |
| 498 | + | ||
| 491 | 499 | return cret | |
| 492 | 500 | } | |
| 493 | 501 | ||
| @@ -498,6 +506,7 @@ var xByteArrayRef func([]byte) uintptr | |||
| 498 | 506 | func ByteArrayRef(ArrayVar []byte) uintptr { | |
| 499 | 507 | ||
| 500 | 508 | cret := xByteArrayRef(ArrayVar) | |
| 509 | + | ||
| 501 | 510 | return cret | |
| 502 | 511 | } | |
| 503 | 512 | ||
| @@ -508,6 +517,7 @@ var xByteArrayRemoveIndex func([]byte, uint) uintptr | |||
| 508 | 517 | func ByteArrayRemoveIndex(ArrayVar []byte, IndexVar uint) uintptr { | |
| 509 | 518 | ||
| 510 | 519 | cret := xByteArrayRemoveIndex(ArrayVar, IndexVar) | |
| 520 | + | ||
| 511 | 521 | return cret | |
| 512 | 522 | } | |
| 513 | 523 | ||
| @@ -520,6 +530,7 @@ var xByteArrayRemoveIndexFast func([]byte, uint) uintptr | |||
| 520 | 530 | func ByteArrayRemoveIndexFast(ArrayVar []byte, IndexVar uint) uintptr { | |
| 521 | 531 | ||
| 522 | 532 | cret := xByteArrayRemoveIndexFast(ArrayVar, IndexVar) | |
| 533 | + | ||
| 523 | 534 | return cret | |
| 524 | 535 | } | |
| 525 | 536 | ||
| @@ -530,6 +541,7 @@ var xByteArrayRemoveRange func([]byte, uint, uint) uintptr | |||
| 530 | 541 | func ByteArrayRemoveRange(ArrayVar []byte, IndexVar uint, LengthVar uint) uintptr { | |
| 531 | 542 | ||
| 532 | 543 | cret := xByteArrayRemoveRange(ArrayVar, IndexVar, LengthVar) | |
| 544 | + | ||
| 533 | 545 | return cret | |
| 534 | 546 | } | |
| 535 | 547 | ||
| @@ -539,6 +551,7 @@ var xByteArraySetSize func([]byte, uint) uintptr | |||
| 539 | 551 | func ByteArraySetSize(ArrayVar []byte, LengthVar uint) uintptr { | |
| 540 | 552 | ||
| 541 | 553 | cret := xByteArraySetSize(ArrayVar, LengthVar) | |
| 554 | + | ||
| 542 | 555 | return cret | |
| 543 | 556 | } | |
| 544 | 557 | ||
| @@ -551,6 +564,7 @@ var xByteArraySizedNew func(uint) uintptr | |||
| 551 | 564 | func ByteArraySizedNew(ReservedSizeVar uint) uintptr { | |
| 552 | 565 | ||
| 553 | 566 | cret := xByteArraySizedNew(ReservedSizeVar) | |
| 567 | + | ||
| 554 | 568 | return cret | |
| 555 | 569 | } | |
| 556 | 570 | ||
| @@ -620,6 +634,7 @@ var xByteArraySteal func([]byte, *uint) uintptr | |||
| 620 | 634 | func ByteArraySteal(ArrayVar []byte, LenVar *uint) uintptr { | |
| 621 | 635 | ||
| 622 | 636 | cret := xByteArraySteal(ArrayVar, LenVar) | |
| 637 | + | ||
| 623 | 638 | return cret | |
| 624 | 639 | } | |
| 625 | 640 | ||
| @@ -648,6 +663,7 @@ var xPtrArrayFind func([]uintptr, uintptr, *uint) bool | |||
| 648 | 663 | func PtrArrayFind(HaystackVar []uintptr, NeedleVar uintptr, IndexVar *uint) bool { | |
| 649 | 664 | ||
| 650 | 665 | cret := xPtrArrayFind(HaystackVar, NeedleVar, IndexVar) | |
| 666 | + | ||
| 651 | 667 | return cret | |
| 652 | 668 | } | |
| 653 | 669 | ||
| @@ -680,6 +696,7 @@ func PtrArrayFindWithEqualFunc(HaystackVar []uintptr, NeedleVar uintptr, EqualFu | |||
| 680 | 696 | } | |
| 681 | 697 | ||
| 682 | 698 | cret := xPtrArrayFindWithEqualFunc(HaystackVar, NeedleVar, EqualFuncVarRef, IndexVar) | |
| 699 | + | ||
| 683 | 700 | return cret | |
| 684 | 701 | } | |
| 685 | 702 | ||
| @@ -735,6 +752,7 @@ func PtrArrayNewFromArray(DataVar []uintptr, LenVar uint, CopyFuncVar *CopyFunc, | |||
| 735 | 752 | } | |
| 736 | 753 | ||
| 737 | 754 | cret := xPtrArrayNewFromArray(DataVar, LenVar, CopyFuncVarRef, CopyFuncUserDataVar, ElementFreeFuncVarRef) | |
| 755 | + | ||
| 738 | 756 | return cret | |
| 739 | 757 | } | |
| 740 | 758 | ||
| @@ -786,6 +804,7 @@ func PtrArrayNewFromNullTerminatedArray(DataVar []uintptr, CopyFuncVar *CopyFunc | |||
| 786 | 804 | } | |
| 787 | 805 | ||
| 788 | 806 | cret := xPtrArrayNewFromNullTerminatedArray(DataVar, CopyFuncVarRef, CopyFuncUserDataVar, ElementFreeFuncVarRef) | |
| 807 | + | ||
| 789 | 808 | return cret | |
| 790 | 809 | } | |
| 791 | 810 | ||
| @@ -825,6 +844,7 @@ func PtrArrayNewTake(DataVar []uintptr, LenVar uint, ElementFreeFuncVar *Destroy | |||
| 825 | 844 | } | |
| 826 | 845 | ||
| 827 | 846 | cret := xPtrArrayNewTake(DataVar, LenVar, ElementFreeFuncVarRef) | |
| 847 | + | ||
| 828 | 848 | return cret | |
| 829 | 849 | } | |
| 830 | 850 | ||
| @@ -867,6 +887,7 @@ func PtrArrayNewTakeNullTerminated(DataVar []uintptr, ElementFreeFuncVar *Destro | |||
| 867 | 887 | } | |
| 868 | 888 | ||
| 869 | 889 | cret := xPtrArrayNewTakeNullTerminated(DataVar, ElementFreeFuncVarRef) | |
| 890 | + | ||
| 870 | 891 | return cret | |
| 871 | 892 | } | |
| 872 | 893 | ||
M v4/glib/gasyncqueue.go +2 -0
| @@ -457,6 +457,7 @@ var xAsyncQueueNew func() *AsyncQueue | |||
| 457 | 457 | func AsyncQueueNew() *AsyncQueue { | |
| 458 | 458 | ||
| 459 | 459 | cret := xAsyncQueueNew() | |
| 460 | + | ||
| 460 | 461 | return cret | |
| 461 | 462 | } | |
| 462 | 463 | ||
| @@ -483,6 +484,7 @@ func AsyncQueueNewFull(ItemFreeFuncVar *DestroyNotify) *AsyncQueue { | |||
| 483 | 484 | } | |
| 484 | 485 | ||
| 485 | 486 | cret := xAsyncQueueNewFull(ItemFreeFuncVarRef) | |
| 487 | + | ||
| 486 | 488 | return cret | |
| 487 | 489 | } | |
| 488 | 490 | ||
M v4/glib/gatomic.go +18 -0
| @@ -23,6 +23,7 @@ var xAtomicIntAdd func(uintptr, int) int | |||
| 23 | 23 | func AtomicIntAdd(AtomicVar uintptr, ValVar int) int { | |
| 24 | 24 | ||
| 25 | 25 | cret := xAtomicIntAdd(AtomicVar, ValVar) | |
| 26 | + | ||
| 26 | 27 | return cret | |
| 27 | 28 | } | |
| 28 | 29 | ||
| @@ -41,6 +42,7 @@ var xAtomicIntAnd func(uintptr, uint) uint | |||
| 41 | 42 | func AtomicIntAnd(AtomicVar uintptr, ValVar uint) uint { | |
| 42 | 43 | ||
| 43 | 44 | cret := xAtomicIntAnd(AtomicVar, ValVar) | |
| 45 | + | ||
| 44 | 46 | return cret | |
| 45 | 47 | } | |
| 46 | 48 | ||
| @@ -61,6 +63,7 @@ var xAtomicIntCompareAndExchange func(uintptr, int, int) bool | |||
| 61 | 63 | func AtomicIntCompareAndExchange(AtomicVar uintptr, OldvalVar int, NewvalVar int) bool { | |
| 62 | 64 | ||
| 63 | 65 | cret := xAtomicIntCompareAndExchange(AtomicVar, OldvalVar, NewvalVar) | |
| 66 | + | ||
| 64 | 67 | return cret | |
| 65 | 68 | } | |
| 66 | 69 | ||
| @@ -81,6 +84,7 @@ var xAtomicIntCompareAndExchangeFull func(uintptr, int, int, *int) bool | |||
| 81 | 84 | func AtomicIntCompareAndExchangeFull(AtomicVar uintptr, OldvalVar int, NewvalVar int, PrevalVar *int) bool { | |
| 82 | 85 | ||
| 83 | 86 | cret := xAtomicIntCompareAndExchangeFull(AtomicVar, OldvalVar, NewvalVar, PrevalVar) | |
| 87 | + | ||
| 84 | 88 | return cret | |
| 85 | 89 | } | |
| 86 | 90 | ||
| @@ -98,6 +102,7 @@ var xAtomicIntDecAndTest func(uintptr) bool | |||
| 98 | 102 | func AtomicIntDecAndTest(AtomicVar uintptr) bool { | |
| 99 | 103 | ||
| 100 | 104 | cret := xAtomicIntDecAndTest(AtomicVar) | |
| 105 | + | ||
| 101 | 106 | return cret | |
| 102 | 107 | } | |
| 103 | 108 | ||
| @@ -114,6 +119,7 @@ var xAtomicIntExchange func(uintptr, int) int | |||
| 114 | 119 | func AtomicIntExchange(AtomicVar uintptr, NewvalVar int) int { | |
| 115 | 120 | ||
| 116 | 121 | cret := xAtomicIntExchange(AtomicVar, NewvalVar) | |
| 122 | + | ||
| 117 | 123 | return cret | |
| 118 | 124 | } | |
| 119 | 125 | ||
| @@ -125,6 +131,7 @@ var xAtomicIntExchangeAndAdd func(uintptr, int) int | |||
| 125 | 131 | func AtomicIntExchangeAndAdd(AtomicVar uintptr, ValVar int) int { | |
| 126 | 132 | ||
| 127 | 133 | cret := xAtomicIntExchangeAndAdd(AtomicVar, ValVar) | |
| 134 | + | ||
| 128 | 135 | return cret | |
| 129 | 136 | } | |
| 130 | 137 | ||
| @@ -140,6 +147,7 @@ var xAtomicIntGet func(uintptr) int | |||
| 140 | 147 | func AtomicIntGet(AtomicVar uintptr) int { | |
| 141 | 148 | ||
| 142 | 149 | cret := xAtomicIntGet(AtomicVar) | |
| 150 | + | ||
| 143 | 151 | return cret | |
| 144 | 152 | } | |
| 145 | 153 | ||
| @@ -174,6 +182,7 @@ var xAtomicIntOr func(uintptr, uint) uint | |||
| 174 | 182 | func AtomicIntOr(AtomicVar uintptr, ValVar uint) uint { | |
| 175 | 183 | ||
| 176 | 184 | cret := xAtomicIntOr(AtomicVar, ValVar) | |
| 185 | + | ||
| 177 | 186 | return cret | |
| 178 | 187 | } | |
| 179 | 188 | ||
| @@ -207,6 +216,7 @@ var xAtomicIntXor func(uintptr, uint) uint | |||
| 207 | 216 | func AtomicIntXor(AtomicVar uintptr, ValVar uint) uint { | |
| 208 | 217 | ||
| 209 | 218 | cret := xAtomicIntXor(AtomicVar, ValVar) | |
| 219 | + | ||
| 210 | 220 | return cret | |
| 211 | 221 | } | |
| 212 | 222 | ||
| @@ -228,6 +238,7 @@ var xAtomicPointerAdd func(uintptr, int) int | |||
| 228 | 238 | func AtomicPointerAdd(AtomicVar uintptr, ValVar int) int { | |
| 229 | 239 | ||
| 230 | 240 | cret := xAtomicPointerAdd(AtomicVar, ValVar) | |
| 241 | + | ||
| 231 | 242 | return cret | |
| 232 | 243 | } | |
| 233 | 244 | ||
| @@ -250,6 +261,7 @@ var xAtomicPointerAnd func(uintptr, uint) uintptr | |||
| 250 | 261 | func AtomicPointerAnd(AtomicVar uintptr, ValVar uint) uintptr { | |
| 251 | 262 | ||
| 252 | 263 | cret := xAtomicPointerAnd(AtomicVar, ValVar) | |
| 264 | + | ||
| 253 | 265 | return cret | |
| 254 | 266 | } | |
| 255 | 267 | ||
| @@ -270,6 +282,7 @@ var xAtomicPointerCompareAndExchange func(uintptr, uintptr, uintptr) bool | |||
| 270 | 282 | func AtomicPointerCompareAndExchange(AtomicVar uintptr, OldvalVar uintptr, NewvalVar uintptr) bool { | |
| 271 | 283 | ||
| 272 | 284 | cret := xAtomicPointerCompareAndExchange(AtomicVar, OldvalVar, NewvalVar) | |
| 285 | + | ||
| 273 | 286 | return cret | |
| 274 | 287 | } | |
| 275 | 288 | ||
| @@ -290,6 +303,7 @@ var xAtomicPointerCompareAndExchangeFull func(uintptr, uintptr, uintptr, *uintpt | |||
| 290 | 303 | func AtomicPointerCompareAndExchangeFull(AtomicVar uintptr, OldvalVar uintptr, NewvalVar uintptr, PrevalVar *uintptr) bool { | |
| 291 | 304 | ||
| 292 | 305 | cret := xAtomicPointerCompareAndExchangeFull(AtomicVar, OldvalVar, NewvalVar, PrevalVar) | |
| 306 | + | ||
| 293 | 307 | return cret | |
| 294 | 308 | } | |
| 295 | 309 | ||
| @@ -306,6 +320,7 @@ var xAtomicPointerExchange func(uintptr, uintptr) uintptr | |||
| 306 | 320 | func AtomicPointerExchange(AtomicVar uintptr, NewvalVar uintptr) uintptr { | |
| 307 | 321 | ||
| 308 | 322 | cret := xAtomicPointerExchange(AtomicVar, NewvalVar) | |
| 323 | + | ||
| 309 | 324 | return cret | |
| 310 | 325 | } | |
| 311 | 326 | ||
| @@ -321,6 +336,7 @@ var xAtomicPointerGet func(uintptr) uintptr | |||
| 321 | 336 | func AtomicPointerGet(AtomicVar uintptr) uintptr { | |
| 322 | 337 | ||
| 323 | 338 | cret := xAtomicPointerGet(AtomicVar) | |
| 339 | + | ||
| 324 | 340 | return cret | |
| 325 | 341 | } | |
| 326 | 342 | ||
| @@ -343,6 +359,7 @@ var xAtomicPointerOr func(uintptr, uint) uintptr | |||
| 343 | 359 | func AtomicPointerOr(AtomicVar uintptr, ValVar uint) uintptr { | |
| 344 | 360 | ||
| 345 | 361 | cret := xAtomicPointerOr(AtomicVar, ValVar) | |
| 362 | + | ||
| 346 | 363 | return cret | |
| 347 | 364 | } | |
| 348 | 365 | ||
| @@ -380,6 +397,7 @@ var xAtomicPointerXor func(uintptr, uint) uintptr | |||
| 380 | 397 | func AtomicPointerXor(AtomicVar uintptr, ValVar uint) uintptr { | |
| 381 | 398 | ||
| 382 | 399 | cret := xAtomicPointerXor(AtomicVar, ValVar) | |
| 400 | + | ||
| 383 | 401 | return cret | |
| 384 | 402 | } | |
| 385 | 403 | ||
M v4/glib/gbase64.go +6 -0
| @@ -14,6 +14,7 @@ var xBase64Decode func(string, *uint) uintptr | |||
| 14 | 14 | func Base64Decode(TextVar string, OutLenVar *uint) uintptr { | |
| 15 | 15 | ||
| 16 | 16 | cret := xBase64Decode(TextVar, OutLenVar) | |
| 17 | + | ||
| 17 | 18 | return cret | |
| 18 | 19 | } | |
| 19 | 20 | ||
| @@ -24,6 +25,7 @@ var xBase64DecodeInplace func([]byte, uint) byte | |||
| 24 | 25 | func Base64DecodeInplace(TextVar []byte, OutLenVar uint) byte { | |
| 25 | 26 | ||
| 26 | 27 | cret := xBase64DecodeInplace(TextVar, OutLenVar) | |
| 28 | + | ||
| 27 | 29 | return cret | |
| 28 | 30 | } | |
| 29 | 31 | ||
| @@ -40,6 +42,7 @@ var xBase64DecodeStep func([]byte, uint, *[]byte, int, uint) uint | |||
| 40 | 42 | func Base64DecodeStep(InVar []byte, LenVar uint, OutVar *[]byte, StateVar int, SaveVar uint) uint { | |
| 41 | 43 | ||
| 42 | 44 | cret := xBase64DecodeStep(InVar, LenVar, OutVar, StateVar, SaveVar) | |
| 45 | + | ||
| 43 | 46 | return cret | |
| 44 | 47 | } | |
| 45 | 48 | ||
| @@ -50,6 +53,7 @@ var xBase64Encode func([]byte, uint) string | |||
| 50 | 53 | func Base64Encode(DataVar []byte, LenVar uint) string { | |
| 51 | 54 | ||
| 52 | 55 | cret := xBase64Encode(DataVar, LenVar) | |
| 56 | + | ||
| 53 | 57 | return cret | |
| 54 | 58 | } | |
| 55 | 59 | ||
| @@ -65,6 +69,7 @@ var xBase64EncodeClose func(bool, *[]byte, int, int) uint | |||
| 65 | 69 | func Base64EncodeClose(BreakLinesVar bool, OutVar *[]byte, StateVar int, SaveVar int) uint { | |
| 66 | 70 | ||
| 67 | 71 | cret := xBase64EncodeClose(BreakLinesVar, OutVar, StateVar, SaveVar) | |
| 72 | + | ||
| 68 | 73 | return cret | |
| 69 | 74 | } | |
| 70 | 75 | ||
| @@ -92,6 +97,7 @@ var xBase64EncodeStep func([]byte, uint, bool, *[]byte, int, int) uint | |||
| 92 | 97 | func Base64EncodeStep(InVar []byte, LenVar uint, BreakLinesVar bool, OutVar *[]byte, StateVar int, SaveVar int) uint { | |
| 93 | 98 | ||
| 94 | 99 | cret := xBase64EncodeStep(InVar, LenVar, BreakLinesVar, OutVar, StateVar, SaveVar) | |
| 100 | + | ||
| 95 | 101 | return cret | |
| 96 | 102 | } | |
| 97 | 103 | ||
M v4/glib/gbitlock.go +3 -0
| @@ -59,6 +59,7 @@ var xBitTrylock func(uintptr, int) bool | |||
| 59 | 59 | func BitTrylock(AddressVar uintptr, LockBitVar int) bool { | |
| 60 | 60 | ||
| 61 | 61 | cret := xBitTrylock(AddressVar, LockBitVar) | |
| 62 | + | ||
| 62 | 63 | return cret | |
| 63 | 64 | } | |
| 64 | 65 | ||
| @@ -130,6 +131,7 @@ var xPointerBitLockMaskPtr func(uintptr, uint, bool, uintptr, uintptr) uintptr | |||
| 130 | 131 | func PointerBitLockMaskPtr(PtrVar uintptr, LockBitVar uint, SetVar bool, PreserveMaskVar uintptr, PreservePtrVar uintptr) uintptr { | |
| 131 | 132 | ||
| 132 | 133 | cret := xPointerBitLockMaskPtr(PtrVar, LockBitVar, SetVar, PreserveMaskVar, PreservePtrVar) | |
| 134 | + | ||
| 133 | 135 | return cret | |
| 134 | 136 | } | |
| 135 | 137 | ||
| @@ -146,6 +148,7 @@ var xPointerBitTrylock func(uintptr, int) bool | |||
| 146 | 148 | func PointerBitTrylock(AddressVar uintptr, LockBitVar int) bool { | |
| 147 | 149 | ||
| 148 | 150 | cret := xPointerBitTrylock(AddressVar, LockBitVar) | |
| 151 | + | ||
| 149 | 152 | return cret | |
| 150 | 153 | } | |
| 151 | 154 | ||
M v4/glib/gcharset.go +6 -0
| @@ -32,6 +32,7 @@ var xGetCharset func(*string) bool | |||
| 32 | 32 | func GetCharset(CharsetVar *string) bool { | |
| 33 | 33 | ||
| 34 | 34 | cret := xGetCharset(CharsetVar) | |
| 35 | + | ||
| 35 | 36 | return cret | |
| 36 | 37 | } | |
| 37 | 38 | ||
| @@ -41,6 +42,7 @@ var xGetCodeset func() string | |||
| 41 | 42 | func GetCodeset() string { | |
| 42 | 43 | ||
| 43 | 44 | cret := xGetCodeset() | |
| 45 | + | ||
| 44 | 46 | return cret | |
| 45 | 47 | } | |
| 46 | 48 | ||
| @@ -66,6 +68,7 @@ var xGetConsoleCharset func(*string) bool | |||
| 66 | 68 | func GetConsoleCharset(CharsetVar *string) bool { | |
| 67 | 69 | ||
| 68 | 70 | cret := xGetConsoleCharset(CharsetVar) | |
| 71 | + | ||
| 69 | 72 | return cret | |
| 70 | 73 | } | |
| 71 | 74 | ||
| @@ -85,6 +88,7 @@ var xGetLanguageNames func() []string | |||
| 85 | 88 | func GetLanguageNames() []string { | |
| 86 | 89 | ||
| 87 | 90 | cret := xGetLanguageNames() | |
| 91 | + | ||
| 88 | 92 | return cret | |
| 89 | 93 | } | |
| 90 | 94 | ||
| @@ -103,6 +107,7 @@ var xGetLanguageNamesWithCategory func(string) []string | |||
| 103 | 107 | func GetLanguageNamesWithCategory(CategoryNameVar string) []string { | |
| 104 | 108 | ||
| 105 | 109 | cret := xGetLanguageNamesWithCategory(CategoryNameVar) | |
| 110 | + | ||
| 106 | 111 | return cret | |
| 107 | 112 | } | |
| 108 | 113 | ||
| @@ -126,6 +131,7 @@ var xGetLocaleVariants func(string) []string | |||
| 126 | 131 | func GetLocaleVariants(LocaleVar string) []string { | |
| 127 | 132 | ||
| 128 | 133 | cret := xGetLocaleVariants(LocaleVar) | |
| 134 | + | ||
| 129 | 135 | return cret | |
| 130 | 136 | } | |
| 131 | 137 | ||
M v4/glib/gchecksum.go +4 -0
| @@ -155,6 +155,7 @@ var xChecksumTypeGetLength func(ChecksumType) int | |||
| 155 | 155 | func ChecksumTypeGetLength(ChecksumTypeVar ChecksumType) int { | |
| 156 | 156 | ||
| 157 | 157 | cret := xChecksumTypeGetLength(ChecksumTypeVar) | |
| 158 | + | ||
| 158 | 159 | return cret | |
| 159 | 160 | } | |
| 160 | 161 | ||
| @@ -168,6 +169,7 @@ var xComputeChecksumForBytes func(ChecksumType, *Bytes) string | |||
| 168 | 169 | func ComputeChecksumForBytes(ChecksumTypeVar ChecksumType, DataVar *Bytes) string { | |
| 169 | 170 | ||
| 170 | 171 | cret := xComputeChecksumForBytes(ChecksumTypeVar, DataVar) | |
| 172 | + | ||
| 171 | 173 | return cret | |
| 172 | 174 | } | |
| 173 | 175 | ||
| @@ -181,6 +183,7 @@ var xComputeChecksumForData func(ChecksumType, []byte, uint) string | |||
| 181 | 183 | func ComputeChecksumForData(ChecksumTypeVar ChecksumType, DataVar []byte, LengthVar uint) string { | |
| 182 | 184 | ||
| 183 | 185 | cret := xComputeChecksumForData(ChecksumTypeVar, DataVar, LengthVar) | |
| 186 | + | ||
| 184 | 187 | return cret | |
| 185 | 188 | } | |
| 186 | 189 | ||
| @@ -192,6 +195,7 @@ var xComputeChecksumForString func(ChecksumType, string, int) string | |||
| 192 | 195 | func ComputeChecksumForString(ChecksumTypeVar ChecksumType, StrVar string, LengthVar int) string { | |
| 193 | 196 | ||
| 194 | 197 | cret := xComputeChecksumForString(ChecksumTypeVar, StrVar, LengthVar) | |
| 198 | + | ||
| 195 | 199 | return cret | |
| 196 | 200 | } | |
| 197 | 201 | ||
M v4/glib/gconvert.go +15 -0
| @@ -107,6 +107,7 @@ func Convert(StrVar []byte, LenVar int, ToCodesetVar string, FromCodesetVar stri | |||
| 107 | 107 | var cerr *Error | |
| 108 | 108 | ||
| 109 | 109 | cret := xConvert(StrVar, LenVar, ToCodesetVar, FromCodesetVar, BytesReadVar, BytesWrittenVar, &cerr) | |
| 110 | + | ||
| 110 | 111 | if cerr == nil { | |
| 111 | 112 | return cret, nil | |
| 112 | 113 | } | |
| @@ -137,6 +138,7 @@ func ConvertWithFallback(StrVar []byte, LenVar int, ToCodesetVar string, FromCod | |||
| 137 | 138 | var cerr *Error | |
| 138 | 139 | ||
| 139 | 140 | cret := xConvertWithFallback(StrVar, LenVar, ToCodesetVar, FromCodesetVar, FallbackVar, BytesReadVar, BytesWrittenVar, &cerr) | |
| 141 | + | ||
| 140 | 142 | if cerr == nil { | |
| 141 | 143 | return cret, nil | |
| 142 | 144 | } | |
| @@ -169,6 +171,7 @@ func ConvertWithIconv(StrVar []byte, LenVar int, ConverterVar uintptr, BytesRead | |||
| 169 | 171 | var cerr *Error | |
| 170 | 172 | ||
| 171 | 173 | cret := xConvertWithIconv(StrVar, LenVar, ConverterVar, BytesReadVar, BytesWrittenVar, &cerr) | |
| 174 | + | ||
| 172 | 175 | if cerr == nil { | |
| 173 | 176 | return cret, nil | |
| 174 | 177 | } | |
| @@ -197,6 +200,7 @@ var xFilenameDisplayBasename func(string) string | |||
| 197 | 200 | func FilenameDisplayBasename(FilenameVar string) string { | |
| 198 | 201 | ||
| 199 | 202 | cret := xFilenameDisplayBasename(FilenameVar) | |
| 203 | + | ||
| 200 | 204 | return cret | |
| 201 | 205 | } | |
| 202 | 206 | ||
| @@ -220,6 +224,7 @@ var xFilenameDisplayName func(string) string | |||
| 220 | 224 | func FilenameDisplayName(FilenameVar string) string { | |
| 221 | 225 | ||
| 222 | 226 | cret := xFilenameDisplayName(FilenameVar) | |
| 227 | + | ||
| 223 | 228 | return cret | |
| 224 | 229 | } | |
| 225 | 230 | ||
| @@ -236,6 +241,7 @@ func FilenameFromUri(UriVar string, HostnameVar *string) (string, error) { | |||
| 236 | 241 | var cerr *Error | |
| 237 | 242 | ||
| 238 | 243 | cret := xFilenameFromUri(UriVar, HostnameVar, &cerr) | |
| 244 | + | ||
| 239 | 245 | if cerr == nil { | |
| 240 | 246 | return cret, nil | |
| 241 | 247 | } | |
| @@ -259,6 +265,7 @@ func FilenameFromUtf8(Utf8stringVar string, LenVar int, BytesReadVar *uint, Byte | |||
| 259 | 265 | var cerr *Error | |
| 260 | 266 | ||
| 261 | 267 | cret := xFilenameFromUtf8(Utf8stringVar, LenVar, BytesReadVar, BytesWrittenVar, &cerr) | |
| 268 | + | ||
| 262 | 269 | if cerr == nil { | |
| 263 | 270 | return cret, nil | |
| 264 | 271 | } | |
| @@ -277,6 +284,7 @@ func FilenameToUri(FilenameVar string, HostnameVar *string) (string, error) { | |||
| 277 | 284 | defer core.GFreeNullable(HostnameVarPtr) | |
| 278 | 285 | ||
| 279 | 286 | cret := xFilenameToUri(FilenameVar, HostnameVarPtr, &cerr) | |
| 287 | + | ||
| 280 | 288 | if cerr == nil { | |
| 281 | 289 | return cret, nil | |
| 282 | 290 | } | |
| @@ -302,6 +310,7 @@ func FilenameToUtf8(OpsysstringVar string, LenVar int, BytesReadVar *uint, Bytes | |||
| 302 | 310 | var cerr *Error | |
| 303 | 311 | ||
| 304 | 312 | cret := xFilenameToUtf8(OpsysstringVar, LenVar, BytesReadVar, BytesWrittenVar, &cerr) | |
| 313 | + | ||
| 305 | 314 | if cerr == nil { | |
| 306 | 315 | return cret, nil | |
| 307 | 316 | } | |
| @@ -338,6 +347,7 @@ var xGetFilenameCharsets func(*[]string) bool | |||
| 338 | 347 | func GetFilenameCharsets(FilenameCharsetsVar *[]string) bool { | |
| 339 | 348 | ||
| 340 | 349 | cret := xGetFilenameCharsets(FilenameCharsetsVar) | |
| 350 | + | ||
| 341 | 351 | return cret | |
| 342 | 352 | } | |
| 343 | 353 | ||
| @@ -362,6 +372,7 @@ var xIconv func(uintptr, string, uint, string, uint) uint | |||
| 362 | 372 | func Iconv(ConverterVar uintptr, InbufVar string, InbytesLeftVar uint, OutbufVar string, OutbytesLeftVar uint) uint { | |
| 363 | 373 | ||
| 364 | 374 | cret := xIconv(ConverterVar, InbufVar, InbytesLeftVar, OutbufVar, OutbytesLeftVar) | |
| 375 | + | ||
| 365 | 376 | return cret | |
| 366 | 377 | } | |
| 367 | 378 | ||
| @@ -376,6 +387,7 @@ var xIconvOpen func(string, string) uintptr | |||
| 376 | 387 | func IconvOpen(ToCodesetVar string, FromCodesetVar string) uintptr { | |
| 377 | 388 | ||
| 378 | 389 | cret := xIconvOpen(ToCodesetVar, FromCodesetVar) | |
| 390 | + | ||
| 379 | 391 | return cret | |
| 380 | 392 | } | |
| 381 | 393 | ||
| @@ -394,6 +406,7 @@ func LocaleFromUtf8(Utf8stringVar string, LenVar int, BytesReadVar *uint, BytesW | |||
| 394 | 406 | var cerr *Error | |
| 395 | 407 | ||
| 396 | 408 | cret := xLocaleFromUtf8(Utf8stringVar, LenVar, BytesReadVar, BytesWrittenVar, &cerr) | |
| 409 | + | ||
| 397 | 410 | if cerr == nil { | |
| 398 | 411 | return cret, nil | |
| 399 | 412 | } | |
| @@ -418,6 +431,7 @@ func LocaleToUtf8(OpsysstringVar []byte, LenVar int, BytesReadVar *uint, BytesWr | |||
| 418 | 431 | var cerr *Error | |
| 419 | 432 | ||
| 420 | 433 | cret := xLocaleToUtf8(OpsysstringVar, LenVar, BytesReadVar, BytesWrittenVar, &cerr) | |
| 434 | + | ||
| 421 | 435 | if cerr == nil { | |
| 422 | 436 | return cret, nil | |
| 423 | 437 | } | |
| @@ -433,6 +447,7 @@ var xUriListExtractUris func(string) []string | |||
| 433 | 447 | func UriListExtractUris(UriListVar string) []string { | |
| 434 | 448 | ||
| 435 | 449 | cret := xUriListExtractUris(UriListVar) | |
| 450 | + | ||
| 436 | 451 | return cret | |
| 437 | 452 | } | |
| 438 | 453 | ||
M v4/glib/gdataset.go +8 -0
| @@ -89,6 +89,7 @@ var xDatalistGetData func(**Data, string) uintptr | |||
| 89 | 89 | func DatalistGetData(DatalistVar **Data, KeyVar string) uintptr { | |
| 90 | 90 | ||
| 91 | 91 | cret := xDatalistGetData(DatalistVar, KeyVar) | |
| 92 | + | ||
| 92 | 93 | return cret | |
| 93 | 94 | } | |
| 94 | 95 | ||
| @@ -99,6 +100,7 @@ var xDatalistGetFlags func(**Data) uint | |||
| 99 | 100 | func DatalistGetFlags(DatalistVar **Data) uint { | |
| 100 | 101 | ||
| 101 | 102 | cret := xDatalistGetFlags(DatalistVar) | |
| 103 | + | ||
| 102 | 104 | return cret | |
| 103 | 105 | } | |
| 104 | 106 | ||
| @@ -135,6 +137,7 @@ func DatalistIdDupData(DatalistVar **Data, KeyIdVar Quark, DupFuncVar *Duplicate | |||
| 135 | 137 | } | |
| 136 | 138 | ||
| 137 | 139 | cret := xDatalistIdDupData(DatalistVar, KeyIdVar, DupFuncVarRef, UserDataVar) | |
| 140 | + | ||
| 138 | 141 | return cret | |
| 139 | 142 | } | |
| 140 | 143 | ||
| @@ -144,6 +147,7 @@ var xDatalistIdGetData func(**Data, Quark) uintptr | |||
| 144 | 147 | func DatalistIdGetData(DatalistVar **Data, KeyIdVar Quark) uintptr { | |
| 145 | 148 | ||
| 146 | 149 | cret := xDatalistIdGetData(DatalistVar, KeyIdVar) | |
| 150 | + | ||
| 147 | 151 | return cret | |
| 148 | 152 | } | |
| 149 | 153 | ||
| @@ -169,6 +173,7 @@ var xDatalistIdRemoveNoNotify func(**Data, Quark) uintptr | |||
| 169 | 173 | func DatalistIdRemoveNoNotify(DatalistVar **Data, KeyIdVar Quark) uintptr { | |
| 170 | 174 | ||
| 171 | 175 | cret := xDatalistIdRemoveNoNotify(DatalistVar, KeyIdVar) | |
| 176 | + | ||
| 172 | 177 | return cret | |
| 173 | 178 | } | |
| 174 | 179 | ||
| @@ -205,6 +210,7 @@ func DatalistIdReplaceData(DatalistVar **Data, KeyIdVar Quark, OldvalVar uintptr | |||
| 205 | 210 | } | |
| 206 | 211 | ||
| 207 | 212 | cret := xDatalistIdReplaceData(DatalistVar, KeyIdVar, OldvalVar, NewvalVar, DestroyVarRef, OldDestroyVar) | |
| 213 | + | ||
| 208 | 214 | return cret | |
| 209 | 215 | } | |
| 210 | 216 | ||
| @@ -315,6 +321,7 @@ var xDatasetIdGetData func(uintptr, Quark) uintptr | |||
| 315 | 321 | func DatasetIdGetData(DatasetLocationVar uintptr, KeyIdVar Quark) uintptr { | |
| 316 | 322 | ||
| 317 | 323 | cret := xDatasetIdGetData(DatasetLocationVar, KeyIdVar) | |
| 324 | + | ||
| 318 | 325 | return cret | |
| 319 | 326 | } | |
| 320 | 327 | ||
| @@ -325,6 +332,7 @@ var xDatasetIdRemoveNoNotify func(uintptr, Quark) uintptr | |||
| 325 | 332 | func DatasetIdRemoveNoNotify(DatasetLocationVar uintptr, KeyIdVar Quark) uintptr { | |
| 326 | 333 | ||
| 327 | 334 | cret := xDatasetIdRemoveNoNotify(DatasetLocationVar, KeyIdVar) | |
| 335 | + | ||
| 328 | 336 | return cret | |
| 329 | 337 | } | |
| 330 | 338 | ||
M v4/glib/gdate.go +12 -0
| @@ -647,6 +647,7 @@ var xDateGetDaysInMonth func(DateMonth, DateYear) byte | |||
| 647 | 647 | func DateGetDaysInMonth(MonthVar DateMonth, YearVar DateYear) byte { | |
| 648 | 648 | ||
| 649 | 649 | cret := xDateGetDaysInMonth(MonthVar, YearVar) | |
| 650 | + | ||
| 650 | 651 | return cret | |
| 651 | 652 | } | |
| 652 | 653 | ||
| @@ -662,6 +663,7 @@ var xDateGetMondayWeeksInYear func(DateYear) byte | |||
| 662 | 663 | func DateGetMondayWeeksInYear(YearVar DateYear) byte { | |
| 663 | 664 | ||
| 664 | 665 | cret := xDateGetMondayWeeksInYear(YearVar) | |
| 666 | + | ||
| 665 | 667 | return cret | |
| 666 | 668 | } | |
| 667 | 669 | ||
| @@ -677,6 +679,7 @@ var xDateGetSundayWeeksInYear func(DateYear) byte | |||
| 677 | 679 | func DateGetSundayWeeksInYear(YearVar DateYear) byte { | |
| 678 | 680 | ||
| 679 | 681 | cret := xDateGetSundayWeeksInYear(YearVar) | |
| 682 | + | ||
| 680 | 683 | return cret | |
| 681 | 684 | } | |
| 682 | 685 | ||
| @@ -694,6 +697,7 @@ var xDateGetWeeksInYear func(DateYear, DateWeekday) byte | |||
| 694 | 697 | func DateGetWeeksInYear(YearVar DateYear, FirstDayOfWeekVar DateWeekday) byte { | |
| 695 | 698 | ||
| 696 | 699 | cret := xDateGetWeeksInYear(YearVar, FirstDayOfWeekVar) | |
| 700 | + | ||
| 697 | 701 | return cret | |
| 698 | 702 | } | |
| 699 | 703 | ||
| @@ -708,6 +712,7 @@ var xDateIsLeapYear func(DateYear) bool | |||
| 708 | 712 | func DateIsLeapYear(YearVar DateYear) bool { | |
| 709 | 713 | ||
| 710 | 714 | cret := xDateIsLeapYear(YearVar) | |
| 715 | + | ||
| 711 | 716 | return cret | |
| 712 | 717 | } | |
| 713 | 718 | ||
| @@ -729,6 +734,7 @@ var xDateStrftime func(string, uint, string, *Date) uint | |||
| 729 | 734 | func DateStrftime(SVar string, SlenVar uint, FormatVar string, DateVar *Date) uint { | |
| 730 | 735 | ||
| 731 | 736 | cret := xDateStrftime(SVar, SlenVar, FormatVar, DateVar) | |
| 737 | + | ||
| 732 | 738 | return cret | |
| 733 | 739 | } | |
| 734 | 740 | ||
| @@ -739,6 +745,7 @@ var xDateValidDay func(DateDay) bool | |||
| 739 | 745 | func DateValidDay(DayVar DateDay) bool { | |
| 740 | 746 | ||
| 741 | 747 | cret := xDateValidDay(DayVar) | |
| 748 | + | ||
| 742 | 749 | return cret | |
| 743 | 750 | } | |
| 744 | 751 | ||
| @@ -750,6 +757,7 @@ var xDateValidDmy func(DateDay, DateMonth, DateYear) bool | |||
| 750 | 757 | func DateValidDmy(DayVar DateDay, MonthVar DateMonth, YearVar DateYear) bool { | |
| 751 | 758 | ||
| 752 | 759 | cret := xDateValidDmy(DayVar, MonthVar, YearVar) | |
| 760 | + | ||
| 753 | 761 | return cret | |
| 754 | 762 | } | |
| 755 | 763 | ||
| @@ -760,6 +768,7 @@ var xDateValidJulian func(uint32) bool | |||
| 760 | 768 | func DateValidJulian(JulianDateVar uint32) bool { | |
| 761 | 769 | ||
| 762 | 770 | cret := xDateValidJulian(JulianDateVar) | |
| 771 | + | ||
| 763 | 772 | return cret | |
| 764 | 773 | } | |
| 765 | 774 | ||
| @@ -770,6 +779,7 @@ var xDateValidMonth func(DateMonth) bool | |||
| 770 | 779 | func DateValidMonth(MonthVar DateMonth) bool { | |
| 771 | 780 | ||
| 772 | 781 | cret := xDateValidMonth(MonthVar) | |
| 782 | + | ||
| 773 | 783 | return cret | |
| 774 | 784 | } | |
| 775 | 785 | ||
| @@ -780,6 +790,7 @@ var xDateValidWeekday func(DateWeekday) bool | |||
| 780 | 790 | func DateValidWeekday(WeekdayVar DateWeekday) bool { | |
| 781 | 791 | ||
| 782 | 792 | cret := xDateValidWeekday(WeekdayVar) | |
| 793 | + | ||
| 783 | 794 | return cret | |
| 784 | 795 | } | |
| 785 | 796 | ||
| @@ -790,6 +801,7 @@ var xDateValidYear func(DateYear) bool | |||
| 790 | 801 | func DateValidYear(YearVar DateYear) bool { | |
| 791 | 802 | ||
| 792 | 803 | cret := xDateValidYear(YearVar) | |
| 804 | + | ||
| 793 | 805 | return cret | |
| 794 | 806 | } | |
| 795 | 807 | ||
M v4/glib/genviron.go +7 -0
| @@ -13,6 +13,7 @@ var xEnvironGetenv func([]string, string) string | |||
| 13 | 13 | func EnvironGetenv(EnvpVar []string, VariableVar string) string { | |
| 14 | 14 | ||
| 15 | 15 | cret := xEnvironGetenv(EnvpVar, VariableVar) | |
| 16 | + | ||
| 16 | 17 | return cret | |
| 17 | 18 | } | |
| 18 | 19 | ||
| @@ -23,6 +24,7 @@ var xEnvironSetenv func([]string, string, string, bool) []string | |||
| 23 | 24 | func EnvironSetenv(EnvpVar []string, VariableVar string, ValueVar string, OverwriteVar bool) []string { | |
| 24 | 25 | ||
| 25 | 26 | cret := xEnvironSetenv(EnvpVar, VariableVar, ValueVar, OverwriteVar) | |
| 27 | + | ||
| 26 | 28 | return cret | |
| 27 | 29 | } | |
| 28 | 30 | ||
| @@ -33,6 +35,7 @@ var xEnvironUnsetenv func([]string, string) []string | |||
| 33 | 35 | func EnvironUnsetenv(EnvpVar []string, VariableVar string) []string { | |
| 34 | 36 | ||
| 35 | 37 | cret := xEnvironUnsetenv(EnvpVar, VariableVar) | |
| 38 | + | ||
| 36 | 39 | return cret | |
| 37 | 40 | } | |
| 38 | 41 | ||
| @@ -51,6 +54,7 @@ var xGetEnviron func() []string | |||
| 51 | 54 | func GetEnviron() []string { | |
| 52 | 55 | ||
| 53 | 56 | cret := xGetEnviron() | |
| 57 | + | ||
| 54 | 58 | return cret | |
| 55 | 59 | } | |
| 56 | 60 | ||
| @@ -66,6 +70,7 @@ var xGetenv func(string) string | |||
| 66 | 70 | func Getenv(VariableVar string) string { | |
| 67 | 71 | ||
| 68 | 72 | cret := xGetenv(VariableVar) | |
| 73 | + | ||
| 69 | 74 | return cret | |
| 70 | 75 | } | |
| 71 | 76 | ||
| @@ -82,6 +87,7 @@ var xListenv func() []string | |||
| 82 | 87 | func Listenv() []string { | |
| 83 | 88 | ||
| 84 | 89 | cret := xListenv() | |
| 90 | + | ||
| 85 | 91 | return cret | |
| 86 | 92 | } | |
| 87 | 93 | ||
| @@ -109,6 +115,7 @@ var xSetenv func(string, string, bool) bool | |||
| 109 | 115 | func Setenv(VariableVar string, ValueVar string, OverwriteVar bool) bool { | |
| 110 | 116 | ||
| 111 | 117 | cret := xSetenv(VariableVar, ValueVar, OverwriteVar) | |
| 118 | + | ||
| 112 | 119 | return cret | |
| 113 | 120 | } | |
| 114 | 121 | ||
M v4/glib/gerror.go +3 -0
| @@ -135,6 +135,7 @@ func ClearError() error { | |||
| 135 | 135 | var cerr *Error | |
| 136 | 136 | ||
| 137 | 137 | xClearError() | |
| 138 | + | ||
| 138 | 139 | if cerr == nil { | |
| 139 | 140 | return nil | |
| 140 | 141 | } | |
| @@ -195,6 +196,7 @@ func ErrorDomainRegister(ErrorTypeNameVar string, ErrorTypePrivateSizeVar uint, | |||
| 195 | 196 | } | |
| 196 | 197 | ||
| 197 | 198 | cret := xErrorDomainRegister(ErrorTypeNameVar, ErrorTypePrivateSizeVar, ErrorTypeInitVarRef, ErrorTypeCopyVarRef, ErrorTypeClearVarRef) | |
| 199 | + | ||
| 198 | 200 | return cret | |
| 199 | 201 | } | |
| 200 | 202 | ||
| @@ -265,6 +267,7 @@ func ErrorDomainRegisterStatic(ErrorTypeNameVar string, ErrorTypePrivateSizeVar | |||
| 265 | 267 | } | |
| 266 | 268 | ||
| 267 | 269 | cret := xErrorDomainRegisterStatic(ErrorTypeNameVar, ErrorTypePrivateSizeVar, ErrorTypeInitVarRef, ErrorTypeCopyVarRef, ErrorTypeClearVarRef) | |
| 270 | + | ||
| 268 | 271 | return cret | |
| 269 | 272 | } | |
| 270 | 273 | ||
M v4/glib/gfileutils.go +25 -0
| @@ -172,6 +172,7 @@ var xBasename func(string) string | |||
| 172 | 172 | func Basename(FileNameVar string) string { | |
| 173 | 173 | ||
| 174 | 174 | cret := xBasename(FileNameVar) | |
| 175 | + | ||
| 175 | 176 | return cret | |
| 176 | 177 | } | |
| 177 | 178 | ||
| @@ -198,6 +199,7 @@ var xBuildFilename func(string, ...interface{}) string | |||
| 198 | 199 | func BuildFilename(FirstElementVar string, varArgs ...interface{}) string { | |
| 199 | 200 | ||
| 200 | 201 | cret := xBuildFilename(FirstElementVar, varArgs...) | |
| 202 | + | ||
| 201 | 203 | return cret | |
| 202 | 204 | } | |
| 203 | 205 | ||
| @@ -214,6 +216,7 @@ var xBuildFilenameValist func(string, []interface{}) string | |||
| 214 | 216 | func BuildFilenameValist(FirstElementVar string, ArgsVar []interface{}) string { | |
| 215 | 217 | ||
| 216 | 218 | cret := xBuildFilenameValist(FirstElementVar, ArgsVar) | |
| 219 | + | ||
| 217 | 220 | return cret | |
| 218 | 221 | } | |
| 219 | 222 | ||
| @@ -231,6 +234,7 @@ var xBuildFilenamev func([]string) string | |||
| 231 | 234 | func BuildFilenamev(ArgsVar []string) string { | |
| 232 | 235 | ||
| 233 | 236 | cret := xBuildFilenamev(ArgsVar) | |
| 237 | + | ||
| 234 | 238 | return cret | |
| 235 | 239 | } | |
| 236 | 240 | ||
| @@ -267,6 +271,7 @@ var xBuildPath func(string, string, ...interface{}) string | |||
| 267 | 271 | func BuildPath(SeparatorVar string, FirstElementVar string, varArgs ...interface{}) string { | |
| 268 | 272 | ||
| 269 | 273 | cret := xBuildPath(SeparatorVar, FirstElementVar, varArgs...) | |
| 274 | + | ||
| 270 | 275 | return cret | |
| 271 | 276 | } | |
| 272 | 277 | ||
| @@ -279,6 +284,7 @@ var xBuildPathv func(string, []string) string | |||
| 279 | 284 | func BuildPathv(SeparatorVar string, ArgsVar []string) string { | |
| 280 | 285 | ||
| 281 | 286 | cret := xBuildPathv(SeparatorVar, ArgsVar) | |
| 287 | + | ||
| 282 | 288 | return cret | |
| 283 | 289 | } | |
| 284 | 290 | ||
| @@ -304,6 +310,7 @@ func CanonicalizeFilename(FilenameVar string, RelativeToVar *string) string { | |||
| 304 | 310 | defer core.GFreeNullable(RelativeToVarPtr) | |
| 305 | 311 | ||
| 306 | 312 | cret := xCanonicalizeFilename(FilenameVar, RelativeToVarPtr) | |
| 313 | + | ||
| 307 | 314 | return cret | |
| 308 | 315 | } | |
| 309 | 316 | ||
| @@ -327,6 +334,7 @@ func DirMakeTmp(TmplVar *string) (string, error) { | |||
| 327 | 334 | defer core.GFreeNullable(TmplVarPtr) | |
| 328 | 335 | ||
| 329 | 336 | cret := xDirMakeTmp(TmplVarPtr, &cerr) | |
| 337 | + | ||
| 330 | 338 | if cerr == nil { | |
| 331 | 339 | return cret, nil | |
| 332 | 340 | } | |
| @@ -348,6 +356,7 @@ var xFileErrorFromErrno func(int) FileError | |||
| 348 | 356 | func FileErrorFromErrno(ErrNoVar int) FileError { | |
| 349 | 357 | ||
| 350 | 358 | cret := xFileErrorFromErrno(ErrNoVar) | |
| 359 | + | ||
| 351 | 360 | return cret | |
| 352 | 361 | } | |
| 353 | 362 | ||
| @@ -367,6 +376,7 @@ func FileGetContents(FilenameVar string, ContentsVar *[]byte, LengthVar *uint) ( | |||
| 367 | 376 | var cerr *Error | |
| 368 | 377 | ||
| 369 | 378 | cret := xFileGetContents(FilenameVar, ContentsVar, LengthVar, &cerr) | |
| 379 | + | ||
| 370 | 380 | if cerr == nil { | |
| 371 | 381 | return cret, nil | |
| 372 | 382 | } | |
| @@ -399,6 +409,7 @@ func FileOpenTmp(TmplVar *string, NameUsedVar *string) (int, error) { | |||
| 399 | 409 | defer core.GFreeNullable(TmplVarPtr) | |
| 400 | 410 | ||
| 401 | 411 | cret := xFileOpenTmp(TmplVarPtr, NameUsedVar, &cerr) | |
| 412 | + | ||
| 402 | 413 | if cerr == nil { | |
| 403 | 414 | return cret, nil | |
| 404 | 415 | } | |
| @@ -438,6 +449,7 @@ func FileReadLink(FilenameVar string) (string, error) { | |||
| 438 | 449 | var cerr *Error | |
| 439 | 450 | ||
| 440 | 451 | cret := xFileReadLink(FilenameVar, &cerr) | |
| 452 | + | ||
| 441 | 453 | if cerr == nil { | |
| 442 | 454 | return cret, nil | |
| 443 | 455 | } | |
| @@ -455,6 +467,7 @@ func FileSetContents(FilenameVar string, ContentsVar []byte, LengthVar int) (boo | |||
| 455 | 467 | var cerr *Error | |
| 456 | 468 | ||
| 457 | 469 | cret := xFileSetContents(FilenameVar, ContentsVar, LengthVar, &cerr) | |
| 470 | + | ||
| 458 | 471 | if cerr == nil { | |
| 459 | 472 | return cret, nil | |
| 460 | 473 | } | |
| @@ -522,6 +535,7 @@ func FileSetContentsFull(FilenameVar string, ContentsVar []byte, LengthVar int, | |||
| 522 | 535 | var cerr *Error | |
| 523 | 536 | ||
| 524 | 537 | cret := xFileSetContentsFull(FilenameVar, ContentsVar, LengthVar, FlagsVar, ModeVar, &cerr) | |
| 538 | + | ||
| 525 | 539 | if cerr == nil { | |
| 526 | 540 | return cret, nil | |
| 527 | 541 | } | |
| @@ -595,6 +609,7 @@ var xNewFileTest func(string, FileTest) bool | |||
| 595 | 609 | func NewFileTest(FilenameVar string, TestVar FileTest) bool { | |
| 596 | 610 | ||
| 597 | 611 | cret := xNewFileTest(FilenameVar, TestVar) | |
| 612 | + | ||
| 598 | 613 | return cret | |
| 599 | 614 | } | |
| 600 | 615 | ||
| @@ -613,6 +628,7 @@ var xGetCurrentDir func() string | |||
| 613 | 628 | func GetCurrentDir() string { | |
| 614 | 629 | ||
| 615 | 630 | cret := xGetCurrentDir() | |
| 631 | + | ||
| 616 | 632 | return cret | |
| 617 | 633 | } | |
| 618 | 634 | ||
| @@ -623,6 +639,7 @@ var xMkdirWithParents func(string, int) int | |||
| 623 | 639 | func MkdirWithParents(PathnameVar string, ModeVar int) int { | |
| 624 | 640 | ||
| 625 | 641 | cret := xMkdirWithParents(PathnameVar, ModeVar) | |
| 642 | + | ||
| 626 | 643 | return cret | |
| 627 | 644 | } | |
| 628 | 645 | ||
| @@ -647,6 +664,7 @@ var xMkdtemp func(string) string | |||
| 647 | 664 | func Mkdtemp(TmplVar string) string { | |
| 648 | 665 | ||
| 649 | 666 | cret := xMkdtemp(TmplVar) | |
| 667 | + | ||
| 650 | 668 | return cret | |
| 651 | 669 | } | |
| 652 | 670 | ||
| @@ -671,6 +689,7 @@ var xMkdtempFull func(string, int) string | |||
| 671 | 689 | func MkdtempFull(TmplVar string, ModeVar int) string { | |
| 672 | 690 | ||
| 673 | 691 | cret := xMkdtempFull(TmplVar, ModeVar) | |
| 692 | + | ||
| 674 | 693 | return cret | |
| 675 | 694 | } | |
| 676 | 695 | ||
| @@ -690,6 +709,7 @@ var xMkstemp func(string) int | |||
| 690 | 709 | func Mkstemp(TmplVar string) int { | |
| 691 | 710 | ||
| 692 | 711 | cret := xMkstemp(TmplVar) | |
| 712 | + | ||
| 693 | 713 | return cret | |
| 694 | 714 | } | |
| 695 | 715 | ||
| @@ -710,6 +730,7 @@ var xMkstempFull func(string, int, int) int | |||
| 710 | 730 | func MkstempFull(TmplVar string, FlagsVar int, ModeVar int) int { | |
| 711 | 731 | ||
| 712 | 732 | cret := xMkstempFull(TmplVar, FlagsVar, ModeVar) | |
| 733 | + | ||
| 713 | 734 | return cret | |
| 714 | 735 | } | |
| 715 | 736 | ||
| @@ -724,6 +745,7 @@ var xPathGetBasename func(string) string | |||
| 724 | 745 | func PathGetBasename(FileNameVar string) string { | |
| 725 | 746 | ||
| 726 | 747 | cret := xPathGetBasename(FileNameVar) | |
| 748 | + | ||
| 727 | 749 | return cret | |
| 728 | 750 | } | |
| 729 | 751 | ||
| @@ -738,6 +760,7 @@ var xPathGetDirname func(string) string | |||
| 738 | 760 | func PathGetDirname(FileNameVar string) string { | |
| 739 | 761 | ||
| 740 | 762 | cret := xPathGetDirname(FileNameVar) | |
| 763 | + | ||
| 741 | 764 | return cret | |
| 742 | 765 | } | |
| 743 | 766 | ||
| @@ -770,6 +793,7 @@ var xPathIsAbsolute func(string) bool | |||
| 770 | 793 | func PathIsAbsolute(FileNameVar string) bool { | |
| 771 | 794 | ||
| 772 | 795 | cret := xPathIsAbsolute(FileNameVar) | |
| 796 | + | ||
| 773 | 797 | return cret | |
| 774 | 798 | } | |
| 775 | 799 | ||
| @@ -781,6 +805,7 @@ var xPathSkipRoot func(string) string | |||
| 781 | 805 | func PathSkipRoot(FileNameVar string) string { | |
| 782 | 806 | ||
| 783 | 807 | cret := xPathSkipRoot(FileNameVar) | |
| 808 | + | ||
| 784 | 809 | return cret | |
| 785 | 810 | } | |
| 786 | 811 | ||
M v4/glib/ggettext.go +6 -0
| @@ -18,6 +18,7 @@ func Dcgettext(DomainVar *string, MsgidVar string, CategoryVar int) string { | |||
| 18 | 18 | defer core.GFreeNullable(DomainVarPtr) | |
| 19 | 19 | ||
| 20 | 20 | cret := xDcgettext(DomainVarPtr, MsgidVar, CategoryVar) | |
| 21 | + | ||
| 21 | 22 | return cret | |
| 22 | 23 | } | |
| 23 | 24 | ||
| @@ -61,6 +62,7 @@ func Dgettext(DomainVar *string, MsgidVar string) string { | |||
| 61 | 62 | defer core.GFreeNullable(DomainVarPtr) | |
| 62 | 63 | ||
| 63 | 64 | cret := xDgettext(DomainVarPtr, MsgidVar) | |
| 65 | + | ||
| 64 | 66 | return cret | |
| 65 | 67 | } | |
| 66 | 68 | ||
| @@ -78,6 +80,7 @@ func Dngettext(DomainVar *string, MsgidVar string, MsgidPluralVar string, NVar u | |||
| 78 | 80 | defer core.GFreeNullable(DomainVarPtr) | |
| 79 | 81 | ||
| 80 | 82 | cret := xDngettext(DomainVarPtr, MsgidVar, MsgidPluralVar, NVar) | |
| 83 | + | ||
| 81 | 84 | return cret | |
| 82 | 85 | } | |
| 83 | 86 | ||
| @@ -102,6 +105,7 @@ func Dpgettext(DomainVar *string, MsgctxtidVar string, MsgidoffsetVar uint) stri | |||
| 102 | 105 | defer core.GFreeNullable(DomainVarPtr) | |
| 103 | 106 | ||
| 104 | 107 | cret := xDpgettext(DomainVarPtr, MsgctxtidVar, MsgidoffsetVar) | |
| 108 | + | ||
| 105 | 109 | return cret | |
| 106 | 110 | } | |
| 107 | 111 | ||
| @@ -123,6 +127,7 @@ func Dpgettext2(DomainVar *string, ContextVar string, MsgidVar string) string { | |||
| 123 | 127 | defer core.GFreeNullable(DomainVarPtr) | |
| 124 | 128 | ||
| 125 | 129 | cret := xDpgettext2(DomainVarPtr, ContextVar, MsgidVar) | |
| 130 | + | ||
| 126 | 131 | return cret | |
| 127 | 132 | } | |
| 128 | 133 | ||
| @@ -132,6 +137,7 @@ var xStripContext func(string, string) string | |||
| 132 | 137 | func StripContext(MsgidVar string, MsgvalVar string) string { | |
| 133 | 138 | ||
| 134 | 139 | cret := xStripContext(MsgidVar, MsgvalVar) | |
| 140 | + | ||
| 135 | 141 | return cret | |
| 136 | 142 | } | |
| 137 | 143 | ||
M v4/glib/ghash.go +29 -0
| @@ -180,6 +180,7 @@ var xDirectEqual func(uintptr, uintptr) bool | |||
| 180 | 180 | func DirectEqual(V1Var uintptr, V2Var uintptr) bool { | |
| 181 | 181 | ||
| 182 | 182 | cret := xDirectEqual(V1Var, V2Var) | |
| 183 | + | ||
| 183 | 184 | return cret | |
| 184 | 185 | } | |
| 185 | 186 | ||
| @@ -195,6 +196,7 @@ var xDirectHash func(uintptr) uint | |||
| 195 | 196 | func DirectHash(VVar uintptr) uint { | |
| 196 | 197 | ||
| 197 | 198 | cret := xDirectHash(VVar) | |
| 199 | + | ||
| 198 | 200 | return cret | |
| 199 | 201 | } | |
| 200 | 202 | ||
| @@ -208,6 +210,7 @@ var xDoubleEqual func(uintptr, uintptr) bool | |||
| 208 | 210 | func DoubleEqual(V1Var uintptr, V2Var uintptr) bool { | |
| 209 | 211 | ||
| 210 | 212 | cret := xDoubleEqual(V1Var, V2Var) | |
| 213 | + | ||
| 211 | 214 | return cret | |
| 212 | 215 | } | |
| 213 | 216 | ||
| @@ -220,6 +223,7 @@ var xDoubleHash func(uintptr) uint | |||
| 220 | 223 | func DoubleHash(VVar uintptr) uint { | |
| 221 | 224 | ||
| 222 | 225 | cret := xDoubleHash(VVar) | |
| 226 | + | ||
| 223 | 227 | return cret | |
| 224 | 228 | } | |
| 225 | 229 | ||
| @@ -243,6 +247,7 @@ var xHashTableAdd func(*HashTable, uintptr) bool | |||
| 243 | 247 | func HashTableAdd(HashTableVar *HashTable, KeyVar uintptr) bool { | |
| 244 | 248 | ||
| 245 | 249 | cret := xHashTableAdd(HashTableVar, KeyVar) | |
| 250 | + | ||
| 246 | 251 | return cret | |
| 247 | 252 | } | |
| 248 | 253 | ||
| @@ -252,6 +257,7 @@ var xHashTableContains func(*HashTable, uintptr) bool | |||
| 252 | 257 | func HashTableContains(HashTableVar *HashTable, KeyVar uintptr) bool { | |
| 253 | 258 | ||
| 254 | 259 | cret := xHashTableContains(HashTableVar, KeyVar) | |
| 260 | + | ||
| 255 | 261 | return cret | |
| 256 | 262 | } | |
| 257 | 263 | ||
| @@ -302,6 +308,7 @@ func HashTableFind(HashTableVar *HashTable, PredicateVar *HRFunc, UserDataVar ui | |||
| 302 | 308 | } | |
| 303 | 309 | ||
| 304 | 310 | cret := xHashTableFind(HashTableVar, PredicateVarRef, UserDataVar) | |
| 311 | + | ||
| 305 | 312 | return cret | |
| 306 | 313 | } | |
| 307 | 314 | ||
| @@ -368,6 +375,7 @@ func HashTableForeachRemove(HashTableVar *HashTable, FuncVar *HRFunc, UserDataVa | |||
| 368 | 375 | } | |
| 369 | 376 | ||
| 370 | 377 | cret := xHashTableForeachRemove(HashTableVar, FuncVarRef, UserDataVar) | |
| 378 | + | ||
| 371 | 379 | return cret | |
| 372 | 380 | } | |
| 373 | 381 | ||
| @@ -398,6 +406,7 @@ func HashTableForeachSteal(HashTableVar *HashTable, FuncVar *HRFunc, UserDataVar | |||
| 398 | 406 | } | |
| 399 | 407 | ||
| 400 | 408 | cret := xHashTableForeachSteal(HashTableVar, FuncVarRef, UserDataVar) | |
| 409 | + | ||
| 401 | 410 | return cret | |
| 402 | 411 | } | |
| 403 | 412 | ||
| @@ -414,6 +423,7 @@ var xHashTableGetKeysAsPtrArray func(*HashTable) uintptr | |||
| 414 | 423 | func HashTableGetKeysAsPtrArray(HashTableVar *HashTable) uintptr { | |
| 415 | 424 | ||
| 416 | 425 | cret := xHashTableGetKeysAsPtrArray(HashTableVar) | |
| 426 | + | ||
| 417 | 427 | return cret | |
| 418 | 428 | } | |
| 419 | 429 | ||
| @@ -430,6 +440,7 @@ var xHashTableGetValuesAsPtrArray func(*HashTable) uintptr | |||
| 430 | 440 | func HashTableGetValuesAsPtrArray(HashTableVar *HashTable) uintptr { | |
| 431 | 441 | ||
| 432 | 442 | cret := xHashTableGetValuesAsPtrArray(HashTableVar) | |
| 443 | + | ||
| 433 | 444 | return cret | |
| 434 | 445 | } | |
| 435 | 446 | ||
| @@ -450,6 +461,7 @@ var xHashTableInsert func(*HashTable, uintptr, uintptr) bool | |||
| 450 | 461 | func HashTableInsert(HashTableVar *HashTable, KeyVar uintptr, ValueVar uintptr) bool { | |
| 451 | 462 | ||
| 452 | 463 | cret := xHashTableInsert(HashTableVar, KeyVar, ValueVar) | |
| 464 | + | ||
| 453 | 465 | return cret | |
| 454 | 466 | } | |
| 455 | 467 | ||
| @@ -462,6 +474,7 @@ var xHashTableLookup func(*HashTable, uintptr) uintptr | |||
| 462 | 474 | func HashTableLookup(HashTableVar *HashTable, KeyVar uintptr) uintptr { | |
| 463 | 475 | ||
| 464 | 476 | cret := xHashTableLookup(HashTableVar, KeyVar) | |
| 477 | + | ||
| 465 | 478 | return cret | |
| 466 | 479 | } | |
| 467 | 480 | ||
| @@ -478,6 +491,7 @@ var xHashTableLookupExtended func(*HashTable, uintptr, *uintptr, *uintptr) bool | |||
| 478 | 491 | func HashTableLookupExtended(HashTableVar *HashTable, LookupKeyVar uintptr, OrigKeyVar *uintptr, ValueVar *uintptr) bool { | |
| 479 | 492 | ||
| 480 | 493 | cret := xHashTableLookupExtended(HashTableVar, LookupKeyVar, OrigKeyVar, ValueVar) | |
| 494 | + | ||
| 481 | 495 | return cret | |
| 482 | 496 | } | |
| 483 | 497 | ||
| @@ -494,6 +508,7 @@ var xHashTableNewSimilar func(*HashTable) *HashTable | |||
| 494 | 508 | func HashTableNewSimilar(OtherHashTableVar *HashTable) *HashTable { | |
| 495 | 509 | ||
| 496 | 510 | cret := xHashTableNewSimilar(OtherHashTableVar) | |
| 511 | + | ||
| 497 | 512 | return cret | |
| 498 | 513 | } | |
| 499 | 514 | ||
| @@ -504,6 +519,7 @@ var xHashTableRef func(*HashTable) *HashTable | |||
| 504 | 519 | func HashTableRef(HashTableVar *HashTable) *HashTable { | |
| 505 | 520 | ||
| 506 | 521 | cret := xHashTableRef(HashTableVar) | |
| 522 | + | ||
| 507 | 523 | return cret | |
| 508 | 524 | } | |
| 509 | 525 | ||
| @@ -518,6 +534,7 @@ var xHashTableRemove func(*HashTable, uintptr) bool | |||
| 518 | 534 | func HashTableRemove(HashTableVar *HashTable, KeyVar uintptr) bool { | |
| 519 | 535 | ||
| 520 | 536 | cret := xHashTableRemove(HashTableVar, KeyVar) | |
| 537 | + | ||
| 521 | 538 | return cret | |
| 522 | 539 | } | |
| 523 | 540 | ||
| @@ -551,6 +568,7 @@ var xHashTableReplace func(*HashTable, uintptr, uintptr) bool | |||
| 551 | 568 | func HashTableReplace(HashTableVar *HashTable, KeyVar uintptr, ValueVar uintptr) bool { | |
| 552 | 569 | ||
| 553 | 570 | cret := xHashTableReplace(HashTableVar, KeyVar, ValueVar) | |
| 571 | + | ||
| 554 | 572 | return cret | |
| 555 | 573 | } | |
| 556 | 574 | ||
| @@ -560,6 +578,7 @@ var xHashTableSize func(*HashTable) uint | |||
| 560 | 578 | func HashTableSize(HashTableVar *HashTable) uint { | |
| 561 | 579 | ||
| 562 | 580 | cret := xHashTableSize(HashTableVar) | |
| 581 | + | ||
| 563 | 582 | return cret | |
| 564 | 583 | } | |
| 565 | 584 | ||
| @@ -570,6 +589,7 @@ var xHashTableSteal func(*HashTable, uintptr) bool | |||
| 570 | 589 | func HashTableSteal(HashTableVar *HashTable, KeyVar uintptr) bool { | |
| 571 | 590 | ||
| 572 | 591 | cret := xHashTableSteal(HashTableVar, KeyVar) | |
| 592 | + | ||
| 573 | 593 | return cret | |
| 574 | 594 | } | |
| 575 | 595 | ||
| @@ -592,6 +612,7 @@ var xHashTableStealAllKeys func(*HashTable) uintptr | |||
| 592 | 612 | func HashTableStealAllKeys(HashTableVar *HashTable) uintptr { | |
| 593 | 613 | ||
| 594 | 614 | cret := xHashTableStealAllKeys(HashTableVar) | |
| 615 | + | ||
| 595 | 616 | return cret | |
| 596 | 617 | } | |
| 597 | 618 | ||
| @@ -604,6 +625,7 @@ var xHashTableStealAllValues func(*HashTable) uintptr | |||
| 604 | 625 | func HashTableStealAllValues(HashTableVar *HashTable) uintptr { | |
| 605 | 626 | ||
| 606 | 627 | cret := xHashTableStealAllValues(HashTableVar) | |
| 628 | + | ||
| 607 | 629 | return cret | |
| 608 | 630 | } | |
| 609 | 631 | ||
| @@ -629,6 +651,7 @@ var xHashTableStealExtended func(*HashTable, uintptr, *uintptr, *uintptr) bool | |||
| 629 | 651 | func HashTableStealExtended(HashTableVar *HashTable, LookupKeyVar uintptr, StolenKeyVar *uintptr, StolenValueVar *uintptr) bool { | |
| 630 | 652 | ||
| 631 | 653 | cret := xHashTableStealExtended(HashTableVar, LookupKeyVar, StolenKeyVar, StolenValueVar) | |
| 654 | + | ||
| 632 | 655 | return cret | |
| 633 | 656 | } | |
| 634 | 657 | ||
| @@ -654,6 +677,7 @@ var xInt64Equal func(uintptr, uintptr) bool | |||
| 654 | 677 | func Int64Equal(V1Var uintptr, V2Var uintptr) bool { | |
| 655 | 678 | ||
| 656 | 679 | cret := xInt64Equal(V1Var, V2Var) | |
| 680 | + | ||
| 657 | 681 | return cret | |
| 658 | 682 | } | |
| 659 | 683 | ||
| @@ -667,6 +691,7 @@ var xInt64Hash func(uintptr) uint | |||
| 667 | 691 | func Int64Hash(VVar uintptr) uint { | |
| 668 | 692 | ||
| 669 | 693 | cret := xInt64Hash(VVar) | |
| 694 | + | ||
| 670 | 695 | return cret | |
| 671 | 696 | } | |
| 672 | 697 | ||
| @@ -684,6 +709,7 @@ var xIntEqual func(uintptr, uintptr) bool | |||
| 684 | 709 | func IntEqual(V1Var uintptr, V2Var uintptr) bool { | |
| 685 | 710 | ||
| 686 | 711 | cret := xIntEqual(V1Var, V2Var) | |
| 712 | + | ||
| 687 | 713 | return cret | |
| 688 | 714 | } | |
| 689 | 715 | ||
| @@ -699,6 +725,7 @@ var xIntHash func(uintptr) uint | |||
| 699 | 725 | func IntHash(VVar uintptr) uint { | |
| 700 | 726 | ||
| 701 | 727 | cret := xIntHash(VVar) | |
| 728 | + | ||
| 702 | 729 | return cret | |
| 703 | 730 | } | |
| 704 | 731 | ||
| @@ -715,6 +742,7 @@ var xStrEqual func(uintptr, uintptr) bool | |||
| 715 | 742 | func StrEqual(V1Var uintptr, V2Var uintptr) bool { | |
| 716 | 743 | ||
| 717 | 744 | cret := xStrEqual(V1Var, V2Var) | |
| 745 | + | ||
| 718 | 746 | return cret | |
| 719 | 747 | } | |
| 720 | 748 | ||
| @@ -737,6 +765,7 @@ var xStrHash func(uintptr) uint | |||
| 737 | 765 | func StrHash(VVar uintptr) uint { | |
| 738 | 766 | ||
| 739 | 767 | cret := xStrHash(VVar) | |
| 768 | + | ||
| 740 | 769 | return cret | |
| 741 | 770 | } | |
| 742 | 771 | ||
M v4/glib/ghmac.go +3 -0
| @@ -148,6 +148,7 @@ var xComputeHmacForBytes func(ChecksumType, *Bytes, *Bytes) string | |||
| 148 | 148 | func ComputeHmacForBytes(DigestTypeVar ChecksumType, KeyVar *Bytes, DataVar *Bytes) string { | |
| 149 | 149 | ||
| 150 | 150 | cret := xComputeHmacForBytes(DigestTypeVar, KeyVar, DataVar) | |
| 151 | + | ||
| 151 | 152 | return cret | |
| 152 | 153 | } | |
| 153 | 154 | ||
| @@ -161,6 +162,7 @@ var xComputeHmacForData func(ChecksumType, []byte, uint, []byte, uint) string | |||
| 161 | 162 | func ComputeHmacForData(DigestTypeVar ChecksumType, KeyVar []byte, KeyLenVar uint, DataVar []byte, LengthVar uint) string { | |
| 162 | 163 | ||
| 163 | 164 | cret := xComputeHmacForData(DigestTypeVar, KeyVar, KeyLenVar, DataVar, LengthVar) | |
| 165 | + | ||
| 164 | 166 | return cret | |
| 165 | 167 | } | |
| 166 | 168 | ||
| @@ -172,6 +174,7 @@ var xComputeHmacForString func(ChecksumType, []byte, uint, string, int) string | |||
| 172 | 174 | func ComputeHmacForString(DigestTypeVar ChecksumType, KeyVar []byte, KeyLenVar uint, StrVar string, LengthVar int) string { | |
| 173 | 175 | ||
| 174 | 176 | cret := xComputeHmacForString(DigestTypeVar, KeyVar, KeyLenVar, StrVar, LengthVar) | |
| 177 | + | ||
| 175 | 178 | return cret | |
| 176 | 179 | } | |
| 177 | 180 | ||
M v4/glib/ghook.go +1 -0
| @@ -207,6 +207,7 @@ var xHookDestroy func(*HookList, uint) bool | |||
| 207 | 207 | func HookDestroy(HookListVar *HookList, HookIdVar uint) bool { | |
| 208 | 208 | ||
| 209 | 209 | cret := xHookDestroy(HookListVar, HookIdVar) | |
| 210 | + | ||
| 210 | 211 | return cret | |
| 211 | 212 | } | |
| 212 | 213 | ||
M v4/glib/ghostutils.go +5 -0
| @@ -19,6 +19,7 @@ var xHostnameIsAsciiEncoded func(string) bool | |||
| 19 | 19 | func HostnameIsAsciiEncoded(HostnameVar string) bool { | |
| 20 | 20 | ||
| 21 | 21 | cret := xHostnameIsAsciiEncoded(HostnameVar) | |
| 22 | + | ||
| 22 | 23 | return cret | |
| 23 | 24 | } | |
| 24 | 25 | ||
| @@ -31,6 +32,7 @@ var xHostnameIsIpAddress func(string) bool | |||
| 31 | 32 | func HostnameIsIpAddress(HostnameVar string) bool { | |
| 32 | 33 | ||
| 33 | 34 | cret := xHostnameIsIpAddress(HostnameVar) | |
| 35 | + | ||
| 34 | 36 | return cret | |
| 35 | 37 | } | |
| 36 | 38 | ||
| @@ -46,6 +48,7 @@ var xHostnameIsNonAscii func(string) bool | |||
| 46 | 48 | func HostnameIsNonAscii(HostnameVar string) bool { | |
| 47 | 49 | ||
| 48 | 50 | cret := xHostnameIsNonAscii(HostnameVar) | |
| 51 | + | ||
| 49 | 52 | return cret | |
| 50 | 53 | } | |
| 51 | 54 | ||
| @@ -57,6 +60,7 @@ var xHostnameToAscii func(string) string | |||
| 57 | 60 | func HostnameToAscii(HostnameVar string) string { | |
| 58 | 61 | ||
| 59 | 62 | cret := xHostnameToAscii(HostnameVar) | |
| 63 | + | ||
| 60 | 64 | return cret | |
| 61 | 65 | } | |
| 62 | 66 | ||
| @@ -72,6 +76,7 @@ var xHostnameToUnicode func(string) string | |||
| 72 | 76 | func HostnameToUnicode(HostnameVar string) string { | |
| 73 | 77 | ||
| 74 | 78 | cret := xHostnameToUnicode(HostnameVar) | |
| 79 | + | ||
| 75 | 80 | return cret | |
| 76 | 81 | } | |
| 77 | 82 | ||
M v4/glib/giochannel.go +4 -0
| @@ -1040,6 +1040,7 @@ func IoAddWatch(ChannelVar *IOChannel, ConditionVar IOCondition, FuncVar *IOFunc | |||
| 1040 | 1040 | } | |
| 1041 | 1041 | ||
| 1042 | 1042 | cret := xIoAddWatch(ChannelVar, ConditionVar, FuncVarRef, UserDataVar) | |
| 1043 | + | ||
| 1043 | 1044 | return cret | |
| 1044 | 1045 | } | |
| 1045 | 1046 | ||
| @@ -1084,6 +1085,7 @@ func IoAddWatchFull(ChannelVar *IOChannel, PriorityVar int, ConditionVar IOCondi | |||
| 1084 | 1085 | } | |
| 1085 | 1086 | ||
| 1086 | 1087 | cret := xIoAddWatchFull(ChannelVar, PriorityVar, ConditionVar, FuncVarRef, UserDataVar, NotifyVarRef) | |
| 1088 | + | ||
| 1087 | 1089 | return cret | |
| 1088 | 1090 | } | |
| 1089 | 1091 | ||
| @@ -1093,6 +1095,7 @@ var xIoChannelErrorFromErrno func(int) IOChannelError | |||
| 1093 | 1095 | func IoChannelErrorFromErrno(EnVar int) IOChannelError { | |
| 1094 | 1096 | ||
| 1095 | 1097 | cret := xIoChannelErrorFromErrno(EnVar) | |
| 1098 | + | ||
| 1096 | 1099 | return cret | |
| 1097 | 1100 | } | |
| 1098 | 1101 | ||
| @@ -1115,6 +1118,7 @@ var xIoCreateWatch func(*IOChannel, IOCondition) *Source | |||
| 1115 | 1118 | func IoCreateWatch(ChannelVar *IOChannel, ConditionVar IOCondition) *Source { | |
| 1116 | 1119 | ||
| 1117 | 1120 | cret := xIoCreateWatch(ChannelVar, ConditionVar) | |
| 1121 | + | ||
| 1118 | 1122 | return cret | |
| 1119 | 1123 | } | |
| 1120 | 1124 | ||
M v4/glib/glib-types.go +2 -0
| @@ -12,6 +12,7 @@ var xStrvGetType func() types.GType | |||
| 12 | 12 | func StrvGetType() types.GType { | |
| 13 | 13 | ||
| 14 | 14 | cret := xStrvGetType() | |
| 15 | + | ||
| 15 | 16 | return cret | |
| 16 | 17 | } | |
| 17 | 18 | ||
| @@ -20,6 +21,7 @@ var xVariantGetGtype func() types.GType | |||
| 20 | 21 | func VariantGetGtype() types.GType { | |
| 21 | 22 | ||
| 22 | 23 | cret := xVariantGetGtype() | |
| 24 | + | ||
| 23 | 25 | return cret | |
| 24 | 26 | } | |
| 25 | 27 | ||
M v4/glib/glib-unix.go +11 -0
| @@ -57,6 +57,7 @@ var xClosefrom func(int) int | |||
| 57 | 57 | func Closefrom(LowfdVar int) int { | |
| 58 | 58 | ||
| 59 | 59 | cret := xClosefrom(LowfdVar) | |
| 60 | + | ||
| 60 | 61 | return cret | |
| 61 | 62 | } | |
| 62 | 63 | ||
| @@ -79,6 +80,7 @@ var xFdwalkSetCloexec func(int) int | |||
| 79 | 80 | func FdwalkSetCloexec(LowfdVar int) int { | |
| 80 | 81 | ||
| 81 | 82 | cret := xFdwalkSetCloexec(LowfdVar) | |
| 83 | + | ||
| 82 | 84 | return cret | |
| 83 | 85 | } | |
| 84 | 86 | ||
| @@ -115,6 +117,7 @@ func UnixFdAdd(FdVar int, ConditionVar IOCondition, FunctionVar *UnixFDSourceFun | |||
| 115 | 117 | } | |
| 116 | 118 | ||
| 117 | 119 | cret := xUnixFdAdd(FdVar, ConditionVar, FunctionVarRef, UserDataVar) | |
| 120 | + | ||
| 118 | 121 | return cret | |
| 119 | 122 | } | |
| 120 | 123 | ||
| @@ -159,6 +162,7 @@ func UnixFdAddFull(PriorityVar int, FdVar int, ConditionVar IOCondition, Functio | |||
| 159 | 162 | } | |
| 160 | 163 | ||
| 161 | 164 | cret := xUnixFdAddFull(PriorityVar, FdVar, ConditionVar, FunctionVarRef, UserDataVar, NotifyVarRef) | |
| 165 | + | ||
| 162 | 166 | return cret | |
| 163 | 167 | } | |
| 164 | 168 | ||
| @@ -174,6 +178,7 @@ var xUnixFdSourceNew func(int, IOCondition) *Source | |||
| 174 | 178 | func UnixFdSourceNew(FdVar int, ConditionVar IOCondition) *Source { | |
| 175 | 179 | ||
| 176 | 180 | cret := xUnixFdSourceNew(FdVar, ConditionVar) | |
| 181 | + | ||
| 177 | 182 | return cret | |
| 178 | 183 | } | |
| 179 | 184 | ||
| @@ -194,6 +199,7 @@ func UnixGetPasswdEntry(UserNameVar string) (uintptr, error) { | |||
| 194 | 199 | var cerr *Error | |
| 195 | 200 | ||
| 196 | 201 | cret := xUnixGetPasswdEntry(UserNameVar, &cerr) | |
| 202 | + | ||
| 197 | 203 | if cerr == nil { | |
| 198 | 204 | return cret, nil | |
| 199 | 205 | } | |
| @@ -226,6 +232,7 @@ func UnixOpenPipe(FdsVar [2]int, FlagsVar int) (bool, error) { | |||
| 226 | 232 | var cerr *Error | |
| 227 | 233 | ||
| 228 | 234 | cret := xUnixOpenPipe(FdsVar, FlagsVar, &cerr) | |
| 235 | + | ||
| 229 | 236 | if cerr == nil { | |
| 230 | 237 | return cret, nil | |
| 231 | 238 | } | |
| @@ -242,6 +249,7 @@ func UnixSetFdNonblocking(FdVar int, NonblockVar bool) (bool, error) { | |||
| 242 | 249 | var cerr *Error | |
| 243 | 250 | ||
| 244 | 251 | cret := xUnixSetFdNonblocking(FdVar, NonblockVar, &cerr) | |
| 252 | + | ||
| 245 | 253 | if cerr == nil { | |
| 246 | 254 | return cret, nil | |
| 247 | 255 | } | |
| @@ -272,6 +280,7 @@ func UnixSignalAdd(SignumVar int, HandlerVar *SourceFunc, UserDataVar uintptr) u | |||
| 272 | 280 | } | |
| 273 | 281 | ||
| 274 | 282 | cret := xUnixSignalAdd(SignumVar, HandlerVarRef, UserDataVar) | |
| 283 | + | ||
| 275 | 284 | return cret | |
| 276 | 285 | } | |
| 277 | 286 | ||
| @@ -313,6 +322,7 @@ func UnixSignalAddFull(PriorityVar int, SignumVar int, HandlerVar *SourceFunc, U | |||
| 313 | 322 | } | |
| 314 | 323 | ||
| 315 | 324 | cret := xUnixSignalAddFull(PriorityVar, SignumVar, HandlerVarRef, UserDataVar, NotifyVarRef) | |
| 325 | + | ||
| 316 | 326 | return cret | |
| 317 | 327 | } | |
| 318 | 328 | ||
| @@ -344,6 +354,7 @@ var xUnixSignalSourceNew func(int) *Source | |||
| 344 | 354 | func UnixSignalSourceNew(SignumVar int) *Source { | |
| 345 | 355 | ||
| 346 | 356 | cret := xUnixSignalSourceNew(SignumVar) | |
| 357 | + | ||
| 347 | 358 | return cret | |
| 348 | 359 | } | |
| 349 | 360 | ||
M v4/glib/gmain.go +45 -189
| @@ -1716,9 +1716,7 @@ func ChildWatchAdd(PidVar Pid, FunctionVar *ChildWatchFunc, DataVar uintptr) uin | |||
| 1716 | 1716 | } | |
| 1717 | 1717 | ||
| 1718 | 1718 | cret := xChildWatchAdd(PidVar, FunctionVarRef, DataVar) | |
| 1719 | - | if FunctionVar != nil { | |
| 1720 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 1721 | - | } | |
| 1719 | + | ||
| 1722 | 1720 | return cret | |
| 1723 | 1721 | } | |
| 1724 | 1722 | ||
| @@ -1782,9 +1780,7 @@ func ChildWatchAddFull(PriorityVar int, PidVar Pid, FunctionVar *ChildWatchFunc, | |||
| 1782 | 1780 | } | |
| 1783 | 1781 | ||
| 1784 | 1782 | cret := xChildWatchAddFull(PriorityVar, PidVar, FunctionVarRef, DataVar, NotifyVarRef) | |
| 1785 | - | if FunctionVar != nil { | |
| 1786 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 1787 | - | } | |
| 1783 | + | ||
| 1788 | 1784 | return cret | |
| 1789 | 1785 | } | |
| 1790 | 1786 | ||
| @@ -1833,6 +1829,7 @@ var xChildWatchSourceNew func(Pid) *Source | |||
| 1833 | 1829 | func ChildWatchSourceNew(PidVar Pid) *Source { | |
| 1834 | 1830 | ||
| 1835 | 1831 | cret := xChildWatchSourceNew(PidVar) | |
| 1832 | + | ||
| 1836 | 1833 | return cret | |
| 1837 | 1834 | } | |
| 1838 | 1835 | ||
| @@ -1899,6 +1896,7 @@ var xGetMonotonicTime func() int64 | |||
| 1899 | 1896 | func GetMonotonicTime() int64 { | |
| 1900 | 1897 | ||
| 1901 | 1898 | cret := xGetMonotonicTime() | |
| 1899 | + | ||
| 1902 | 1900 | return cret | |
| 1903 | 1901 | } | |
| 1904 | 1902 | ||
| @@ -1915,6 +1913,7 @@ var xGetRealTime func() int64 | |||
| 1915 | 1913 | func GetRealTime() int64 { | |
| 1916 | 1914 | ||
| 1917 | 1915 | cret := xGetRealTime() | |
| 1916 | + | ||
| 1918 | 1917 | return cret | |
| 1919 | 1918 | } | |
| 1920 | 1919 | ||
| @@ -1937,26 +1936,9 @@ var xIdleAdd func(uintptr, uintptr) uint | |||
| 1937 | 1936 | // thread is running that main context. You can do these steps manually if you | |
| 1938 | 1937 | // need greater control or to use a custom main context. | |
| 1939 | 1938 | func IdleAdd(FunctionVar *SourceFunc, DataVar uintptr) uint { | |
| 1940 | - | ||
| 1941 | - | var FunctionVarRef uintptr | |
| 1942 | - | if FunctionVar != nil { | |
| 1943 | - | FunctionVarPtr := uintptr(unsafe.Pointer(FunctionVar)) | |
| 1944 | - | if cbRefPtr, ok := GetCallback(FunctionVarPtr); ok { | |
| 1945 | - | FunctionVarRef = cbRefPtr | |
| 1946 | - | } else { | |
| 1947 | - | fcb := func(arg0 uintptr) bool { | |
| 1948 | - | cbFn := *FunctionVar | |
| 1949 | - | return cbFn(arg0) | |
| 1950 | - | } | |
| 1951 | - | FunctionVarRef = purego.NewCallback(fcb) | |
| 1952 | - | SaveCallbackWithClosure(FunctionVarPtr, FunctionVarRef, FunctionVar) | |
| 1953 | - | } | |
| 1954 | - | } | |
| 1955 | - | ||
| 1956 | - | cret := xIdleAdd(FunctionVarRef, DataVar) | |
| 1957 | - | if FunctionVar != nil { | |
| 1958 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 1959 | - | } | |
| 1939 | + | trampolineCb, userData := registerSourceFunc(FunctionVar, false) | |
| 1940 | + | cret := xIdleAdd(trampolineCb, userData) | |
| 1941 | + | saveSourceTrampolineMapping(cret, userData) | |
| 1960 | 1942 | return cret | |
| 1961 | 1943 | } | |
| 1962 | 1944 | ||
| @@ -1977,22 +1959,7 @@ var xIdleAddFull func(int, uintptr, uintptr, uintptr) uint | |||
| 1977 | 1959 | // thread is running that main context. You can do these steps manually if you | |
| 1978 | 1960 | // need greater control or to use a custom main context. | |
| 1979 | 1961 | func IdleAddFull(PriorityVar int, FunctionVar *SourceFunc, DataVar uintptr, NotifyVar *DestroyNotify) uint { | |
| 1980 | - | ||
| 1981 | - | var FunctionVarRef uintptr | |
| 1982 | - | if FunctionVar != nil { | |
| 1983 | - | FunctionVarPtr := uintptr(unsafe.Pointer(FunctionVar)) | |
| 1984 | - | if cbRefPtr, ok := GetCallback(FunctionVarPtr); ok { | |
| 1985 | - | FunctionVarRef = cbRefPtr | |
| 1986 | - | } else { | |
| 1987 | - | fcb := func(arg0 uintptr) bool { | |
| 1988 | - | cbFn := *FunctionVar | |
| 1989 | - | return cbFn(arg0) | |
| 1990 | - | } | |
| 1991 | - | FunctionVarRef = purego.NewCallback(fcb) | |
| 1992 | - | SaveCallbackWithClosure(FunctionVarPtr, FunctionVarRef, FunctionVar) | |
| 1993 | - | } | |
| 1994 | - | } | |
| 1995 | - | ||
| 1962 | + | trampolineCb, userData := registerSourceFunc(FunctionVar, false) | |
| 1996 | 1963 | var NotifyVarRef uintptr | |
| 1997 | 1964 | if NotifyVar != nil { | |
| 1998 | 1965 | NotifyVarPtr := uintptr(unsafe.Pointer(NotifyVar)) | |
| @@ -2007,11 +1974,8 @@ func IdleAddFull(PriorityVar int, FunctionVar *SourceFunc, DataVar uintptr, Noti | |||
| 2007 | 1974 | SaveCallbackWithClosure(NotifyVarPtr, NotifyVarRef, NotifyVar) | |
| 2008 | 1975 | } | |
| 2009 | 1976 | } | |
| 2010 | - | ||
| 2011 | - | cret := xIdleAddFull(PriorityVar, FunctionVarRef, DataVar, NotifyVarRef) | |
| 2012 | - | if FunctionVar != nil { | |
| 2013 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 2014 | - | } | |
| 1977 | + | cret := xIdleAddFull(PriorityVar, trampolineCb, userData, NotifyVarRef) | |
| 1978 | + | saveSourceTrampolineMapping(cret, userData) | |
| 2015 | 1979 | return cret | |
| 2016 | 1980 | } | |
| 2017 | 1981 | ||
| @@ -2028,26 +1992,9 @@ var xIdleAddOnce func(uintptr, uintptr) uint | |||
| 2028 | 1992 | // | |
| 2029 | 1993 | // This function otherwise behaves like [func@GLib.idle_add]. | |
| 2030 | 1994 | func IdleAddOnce(FunctionVar *SourceOnceFunc, DataVar uintptr) uint { | |
| 2031 | - | ||
| 2032 | - | var FunctionVarRef uintptr | |
| 2033 | - | if FunctionVar != nil { | |
| 2034 | - | FunctionVarPtr := uintptr(unsafe.Pointer(FunctionVar)) | |
| 2035 | - | if cbRefPtr, ok := GetCallback(FunctionVarPtr); ok { | |
| 2036 | - | FunctionVarRef = cbRefPtr | |
| 2037 | - | } else { | |
| 2038 | - | fcb := func(arg0 uintptr) { | |
| 2039 | - | cbFn := *FunctionVar | |
| 2040 | - | cbFn(arg0) | |
| 2041 | - | } | |
| 2042 | - | FunctionVarRef = purego.NewCallback(fcb) | |
| 2043 | - | SaveCallbackWithClosure(FunctionVarPtr, FunctionVarRef, FunctionVar) | |
| 2044 | - | } | |
| 2045 | - | } | |
| 2046 | - | ||
| 2047 | - | cret := xIdleAddOnce(FunctionVarRef, DataVar) | |
| 2048 | - | if FunctionVar != nil { | |
| 2049 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 2050 | - | } | |
| 1995 | + | trampolineCb, userData := registerSourceOnceFunc(FunctionVar) | |
| 1996 | + | cret := xIdleAddOnce(trampolineCb, userData) | |
| 1997 | + | saveSourceTrampolineMapping(cret, userData) | |
| 2051 | 1998 | return cret | |
| 2052 | 1999 | } | |
| 2053 | 2000 | ||
| @@ -2057,6 +2004,7 @@ var xIdleRemoveByData func(uintptr) bool | |||
| 2057 | 2004 | func IdleRemoveByData(DataVar uintptr) bool { | |
| 2058 | 2005 | ||
| 2059 | 2006 | cret := xIdleRemoveByData(DataVar) | |
| 2007 | + | ||
| 2060 | 2008 | return cret | |
| 2061 | 2009 | } | |
| 2062 | 2010 | ||
| @@ -2073,6 +2021,7 @@ var xIdleSourceNew func() *Source | |||
| 2073 | 2021 | func IdleSourceNew() *Source { | |
| 2074 | 2022 | ||
| 2075 | 2023 | cret := xIdleSourceNew() | |
| 2024 | + | ||
| 2076 | 2025 | return cret | |
| 2077 | 2026 | } | |
| 2078 | 2027 | ||
| @@ -2087,6 +2036,7 @@ var xMainContextDefault func() *MainContext | |||
| 2087 | 2036 | func MainContextDefault() *MainContext { | |
| 2088 | 2037 | ||
| 2089 | 2038 | cret := xMainContextDefault() | |
| 2039 | + | ||
| 2090 | 2040 | return cret | |
| 2091 | 2041 | } | |
| 2092 | 2042 | ||
| @@ -2107,6 +2057,7 @@ var xMainContextGetThreadDefault func() *MainContext | |||
| 2107 | 2057 | func MainContextGetThreadDefault() *MainContext { | |
| 2108 | 2058 | ||
| 2109 | 2059 | cret := xMainContextGetThreadDefault() | |
| 2060 | + | ||
| 2110 | 2061 | return cret | |
| 2111 | 2062 | } | |
| 2112 | 2063 | ||
| @@ -2125,6 +2076,7 @@ var xMainContextRefThreadDefault func() *MainContext | |||
| 2125 | 2076 | func MainContextRefThreadDefault() *MainContext { | |
| 2126 | 2077 | ||
| 2127 | 2078 | cret := xMainContextRefThreadDefault() | |
| 2079 | + | ||
| 2128 | 2080 | return cret | |
| 2129 | 2081 | } | |
| 2130 | 2082 | ||
| @@ -2134,6 +2086,7 @@ var xMainCurrentSource func() *Source | |||
| 2134 | 2086 | func MainCurrentSource() *Source { | |
| 2135 | 2087 | ||
| 2136 | 2088 | cret := xMainCurrentSource() | |
| 2089 | + | ||
| 2137 | 2090 | return cret | |
| 2138 | 2091 | } | |
| 2139 | 2092 | ||
| @@ -2251,6 +2204,7 @@ var xMainDepth func() int | |||
| 2251 | 2204 | func MainDepth() int { | |
| 2252 | 2205 | ||
| 2253 | 2206 | cret := xMainDepth() | |
| 2207 | + | ||
| 2254 | 2208 | return cret | |
| 2255 | 2209 | } | |
| 2256 | 2210 | ||
| @@ -2281,8 +2235,10 @@ var xSourceRemove func(uint) bool | |||
| 2281 | 2235 | func SourceRemove(TagVar uint) bool { | |
| 2282 | 2236 | ||
| 2283 | 2237 | cret := xSourceRemove(TagVar) | |
| 2238 | + | ||
| 2284 | 2239 | if cret { | |
| 2285 | 2240 | RemoveCallbackBySource(TagVar) | |
| 2241 | + | removeSourceTrampolineBySourceID(TagVar) | |
| 2286 | 2242 | } | |
| 2287 | 2243 | return cret | |
| 2288 | 2244 | } | |
| @@ -2297,6 +2253,7 @@ var xSourceRemoveByFuncsUserData func(*SourceFuncs, uintptr) bool | |||
| 2297 | 2253 | func SourceRemoveByFuncsUserData(FuncsVar *SourceFuncs, UserDataVar uintptr) bool { | |
| 2298 | 2254 | ||
| 2299 | 2255 | cret := xSourceRemoveByFuncsUserData(FuncsVar, UserDataVar) | |
| 2256 | + | ||
| 2300 | 2257 | return cret | |
| 2301 | 2258 | } | |
| 2302 | 2259 | ||
| @@ -2309,6 +2266,7 @@ var xSourceRemoveByUserData func(uintptr) bool | |||
| 2309 | 2266 | func SourceRemoveByUserData(UserDataVar uintptr) bool { | |
| 2310 | 2267 | ||
| 2311 | 2268 | cret := xSourceRemoveByUserData(UserDataVar) | |
| 2269 | + | ||
| 2312 | 2270 | return cret | |
| 2313 | 2271 | } | |
| 2314 | 2272 | ||
| @@ -2372,26 +2330,9 @@ var xTimeoutAdd func(uint, uintptr, uintptr) uint | |||
| 2372 | 2330 | // The interval given is in terms of monotonic time, not wall clock | |
| 2373 | 2331 | // time. See [func@GLib.get_monotonic_time]. | |
| 2374 | 2332 | func TimeoutAdd(IntervalVar uint, FunctionVar *SourceFunc, DataVar uintptr) uint { | |
| 2375 | - | ||
| 2376 | - | var FunctionVarRef uintptr | |
| 2377 | - | if FunctionVar != nil { | |
| 2378 | - | FunctionVarPtr := uintptr(unsafe.Pointer(FunctionVar)) | |
| 2379 | - | if cbRefPtr, ok := GetCallback(FunctionVarPtr); ok { | |
| 2380 | - | FunctionVarRef = cbRefPtr | |
| 2381 | - | } else { | |
| 2382 | - | fcb := func(arg0 uintptr) bool { | |
| 2383 | - | cbFn := *FunctionVar | |
| 2384 | - | return cbFn(arg0) | |
| 2385 | - | } | |
| 2386 | - | FunctionVarRef = purego.NewCallback(fcb) | |
| 2387 | - | SaveCallbackWithClosure(FunctionVarPtr, FunctionVarRef, FunctionVar) | |
| 2388 | - | } | |
| 2389 | - | } | |
| 2390 | - | ||
| 2391 | - | cret := xTimeoutAdd(IntervalVar, FunctionVarRef, DataVar) | |
| 2392 | - | if FunctionVar != nil { | |
| 2393 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 2394 | - | } | |
| 2333 | + | trampolineCb, userData := registerSourceFunc(FunctionVar, false) | |
| 2334 | + | cret := xTimeoutAdd(IntervalVar, trampolineCb, userData) | |
| 2335 | + | saveSourceTrampolineMapping(cret, userData) | |
| 2395 | 2336 | return cret | |
| 2396 | 2337 | } | |
| 2397 | 2338 | ||
| @@ -2426,22 +2367,7 @@ var xTimeoutAddFull func(int, uint, uintptr, uintptr, uintptr) uint | |||
| 2426 | 2367 | // The interval given is in terms of monotonic time, not wall clock time. | |
| 2427 | 2368 | // See [func@GLib.get_monotonic_time]. | |
| 2428 | 2369 | func TimeoutAddFull(PriorityVar int, IntervalVar uint, FunctionVar *SourceFunc, DataVar uintptr, NotifyVar *DestroyNotify) uint { | |
| 2429 | - | ||
| 2430 | - | var FunctionVarRef uintptr | |
| 2431 | - | if FunctionVar != nil { | |
| 2432 | - | FunctionVarPtr := uintptr(unsafe.Pointer(FunctionVar)) | |
| 2433 | - | if cbRefPtr, ok := GetCallback(FunctionVarPtr); ok { | |
| 2434 | - | FunctionVarRef = cbRefPtr | |
| 2435 | - | } else { | |
| 2436 | - | fcb := func(arg0 uintptr) bool { | |
| 2437 | - | cbFn := *FunctionVar | |
| 2438 | - | return cbFn(arg0) | |
| 2439 | - | } | |
| 2440 | - | FunctionVarRef = purego.NewCallback(fcb) | |
| 2441 | - | SaveCallbackWithClosure(FunctionVarPtr, FunctionVarRef, FunctionVar) | |
| 2442 | - | } | |
| 2443 | - | } | |
| 2444 | - | ||
| 2370 | + | trampolineCb, userData := registerSourceFunc(FunctionVar, false) | |
| 2445 | 2371 | var NotifyVarRef uintptr | |
| 2446 | 2372 | if NotifyVar != nil { | |
| 2447 | 2373 | NotifyVarPtr := uintptr(unsafe.Pointer(NotifyVar)) | |
| @@ -2456,11 +2382,8 @@ func TimeoutAddFull(PriorityVar int, IntervalVar uint, FunctionVar *SourceFunc, | |||
| 2456 | 2382 | SaveCallbackWithClosure(NotifyVarPtr, NotifyVarRef, NotifyVar) | |
| 2457 | 2383 | } | |
| 2458 | 2384 | } | |
| 2459 | - | ||
| 2460 | - | cret := xTimeoutAddFull(PriorityVar, IntervalVar, FunctionVarRef, DataVar, NotifyVarRef) | |
| 2461 | - | if FunctionVar != nil { | |
| 2462 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 2463 | - | } | |
| 2385 | + | cret := xTimeoutAddFull(PriorityVar, IntervalVar, trampolineCb, userData, NotifyVarRef) | |
| 2386 | + | saveSourceTrampolineMapping(cret, userData) | |
| 2464 | 2387 | return cret | |
| 2465 | 2388 | } | |
| 2466 | 2389 | ||
| @@ -2474,26 +2397,9 @@ var xTimeoutAddOnce func(uint, uintptr, uintptr) uint | |||
| 2474 | 2397 | // | |
| 2475 | 2398 | // This function otherwise behaves like [func@GLib.timeout_add]. | |
| 2476 | 2399 | func TimeoutAddOnce(IntervalVar uint, FunctionVar *SourceOnceFunc, DataVar uintptr) uint { | |
| 2477 | - | ||
| 2478 | - | var FunctionVarRef uintptr | |
| 2479 | - | if FunctionVar != nil { | |
| 2480 | - | FunctionVarPtr := uintptr(unsafe.Pointer(FunctionVar)) | |
| 2481 | - | if cbRefPtr, ok := GetCallback(FunctionVarPtr); ok { | |
| 2482 | - | FunctionVarRef = cbRefPtr | |
| 2483 | - | } else { | |
| 2484 | - | fcb := func(arg0 uintptr) { | |
| 2485 | - | cbFn := *FunctionVar | |
| 2486 | - | cbFn(arg0) | |
| 2487 | - | } | |
| 2488 | - | FunctionVarRef = purego.NewCallback(fcb) | |
| 2489 | - | SaveCallbackWithClosure(FunctionVarPtr, FunctionVarRef, FunctionVar) | |
| 2490 | - | } | |
| 2491 | - | } | |
| 2492 | - | ||
| 2493 | - | cret := xTimeoutAddOnce(IntervalVar, FunctionVarRef, DataVar) | |
| 2494 | - | if FunctionVar != nil { | |
| 2495 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 2496 | - | } | |
| 2400 | + | trampolineCb, userData := registerSourceOnceFunc(FunctionVar) | |
| 2401 | + | cret := xTimeoutAddOnce(IntervalVar, trampolineCb, userData) | |
| 2402 | + | saveSourceTrampolineMapping(cret, userData) | |
| 2497 | 2403 | return cret | |
| 2498 | 2404 | } | |
| 2499 | 2405 | ||
| @@ -2523,26 +2429,9 @@ var xTimeoutAddSeconds func(uint, uintptr, uintptr) uint | |||
| 2523 | 2429 | // The interval given is in terms of monotonic time, not wall clock | |
| 2524 | 2430 | // time. See [func@GLib.get_monotonic_time]. | |
| 2525 | 2431 | func TimeoutAddSeconds(IntervalVar uint, FunctionVar *SourceFunc, DataVar uintptr) uint { | |
| 2526 | - | ||
| 2527 | - | var FunctionVarRef uintptr | |
| 2528 | - | if FunctionVar != nil { | |
| 2529 | - | FunctionVarPtr := uintptr(unsafe.Pointer(FunctionVar)) | |
| 2530 | - | if cbRefPtr, ok := GetCallback(FunctionVarPtr); ok { | |
| 2531 | - | FunctionVarRef = cbRefPtr | |
| 2532 | - | } else { | |
| 2533 | - | fcb := func(arg0 uintptr) bool { | |
| 2534 | - | cbFn := *FunctionVar | |
| 2535 | - | return cbFn(arg0) | |
| 2536 | - | } | |
| 2537 | - | FunctionVarRef = purego.NewCallback(fcb) | |
| 2538 | - | SaveCallbackWithClosure(FunctionVarPtr, FunctionVarRef, FunctionVar) | |
| 2539 | - | } | |
| 2540 | - | } | |
| 2541 | - | ||
| 2542 | - | cret := xTimeoutAddSeconds(IntervalVar, FunctionVarRef, DataVar) | |
| 2543 | - | if FunctionVar != nil { | |
| 2544 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 2545 | - | } | |
| 2432 | + | trampolineCb, userData := registerSourceFunc(FunctionVar, false) | |
| 2433 | + | cret := xTimeoutAddSeconds(IntervalVar, trampolineCb, userData) | |
| 2434 | + | saveSourceTrampolineMapping(cret, userData) | |
| 2546 | 2435 | return cret | |
| 2547 | 2436 | } | |
| 2548 | 2437 | ||
| @@ -2589,22 +2478,7 @@ var xTimeoutAddSecondsFull func(int, uint, uintptr, uintptr, uintptr) uint | |||
| 2589 | 2478 | // The interval given is in terms of monotonic time, not wall clock | |
| 2590 | 2479 | // time. See [func@GLib.get_monotonic_time]. | |
| 2591 | 2480 | func TimeoutAddSecondsFull(PriorityVar int, IntervalVar uint, FunctionVar *SourceFunc, DataVar uintptr, NotifyVar *DestroyNotify) uint { | |
| 2592 | - | ||
| 2593 | - | var FunctionVarRef uintptr | |
| 2594 | - | if FunctionVar != nil { | |
| 2595 | - | FunctionVarPtr := uintptr(unsafe.Pointer(FunctionVar)) | |
| 2596 | - | if cbRefPtr, ok := GetCallback(FunctionVarPtr); ok { | |
| 2597 | - | FunctionVarRef = cbRefPtr | |
| 2598 | - | } else { | |
| 2599 | - | fcb := func(arg0 uintptr) bool { | |
| 2600 | - | cbFn := *FunctionVar | |
| 2601 | - | return cbFn(arg0) | |
| 2602 | - | } | |
| 2603 | - | FunctionVarRef = purego.NewCallback(fcb) | |
| 2604 | - | SaveCallbackWithClosure(FunctionVarPtr, FunctionVarRef, FunctionVar) | |
| 2605 | - | } | |
| 2606 | - | } | |
| 2607 | - | ||
| 2481 | + | trampolineCb, userData := registerSourceFunc(FunctionVar, false) | |
| 2608 | 2482 | var NotifyVarRef uintptr | |
| 2609 | 2483 | if NotifyVar != nil { | |
| 2610 | 2484 | NotifyVarPtr := uintptr(unsafe.Pointer(NotifyVar)) | |
| @@ -2619,11 +2493,8 @@ func TimeoutAddSecondsFull(PriorityVar int, IntervalVar uint, FunctionVar *Sourc | |||
| 2619 | 2493 | SaveCallbackWithClosure(NotifyVarPtr, NotifyVarRef, NotifyVar) | |
| 2620 | 2494 | } | |
| 2621 | 2495 | } | |
| 2622 | - | ||
| 2623 | - | cret := xTimeoutAddSecondsFull(PriorityVar, IntervalVar, FunctionVarRef, DataVar, NotifyVarRef) | |
| 2624 | - | if FunctionVar != nil { | |
| 2625 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 2626 | - | } | |
| 2496 | + | cret := xTimeoutAddSecondsFull(PriorityVar, IntervalVar, trampolineCb, userData, NotifyVarRef) | |
| 2497 | + | saveSourceTrampolineMapping(cret, userData) | |
| 2627 | 2498 | return cret | |
| 2628 | 2499 | } | |
| 2629 | 2500 | ||
| @@ -2632,26 +2503,9 @@ var xTimeoutAddSecondsOnce func(uint, uintptr, uintptr) uint | |||
| 2632 | 2503 | // This function behaves like [func@GLib.timeout_add_once] but with a range in | |
| 2633 | 2504 | // seconds. | |
| 2634 | 2505 | func TimeoutAddSecondsOnce(IntervalVar uint, FunctionVar *SourceOnceFunc, DataVar uintptr) uint { | |
| 2635 | - | ||
| 2636 | - | var FunctionVarRef uintptr | |
| 2637 | - | if FunctionVar != nil { | |
| 2638 | - | FunctionVarPtr := uintptr(unsafe.Pointer(FunctionVar)) | |
| 2639 | - | if cbRefPtr, ok := GetCallback(FunctionVarPtr); ok { | |
| 2640 | - | FunctionVarRef = cbRefPtr | |
| 2641 | - | } else { | |
| 2642 | - | fcb := func(arg0 uintptr) { | |
| 2643 | - | cbFn := *FunctionVar | |
| 2644 | - | cbFn(arg0) | |
| 2645 | - | } | |
| 2646 | - | FunctionVarRef = purego.NewCallback(fcb) | |
| 2647 | - | SaveCallbackWithClosure(FunctionVarPtr, FunctionVarRef, FunctionVar) | |
| 2648 | - | } | |
| 2649 | - | } | |
| 2650 | - | ||
| 2651 | - | cret := xTimeoutAddSecondsOnce(IntervalVar, FunctionVarRef, DataVar) | |
| 2652 | - | if FunctionVar != nil { | |
| 2653 | - | SaveSourceMapping(cret, uintptr(unsafe.Pointer(FunctionVar))) | |
| 2654 | - | } | |
| 2506 | + | trampolineCb, userData := registerSourceOnceFunc(FunctionVar) | |
| 2507 | + | cret := xTimeoutAddSecondsOnce(IntervalVar, trampolineCb, userData) | |
| 2508 | + | saveSourceTrampolineMapping(cret, userData) | |
| 2655 | 2509 | return cret | |
| 2656 | 2510 | } | |
| 2657 | 2511 | ||
| @@ -2668,6 +2522,7 @@ var xTimeoutSourceNew func(uint) *Source | |||
| 2668 | 2522 | func TimeoutSourceNew(IntervalVar uint) *Source { | |
| 2669 | 2523 | ||
| 2670 | 2524 | cret := xTimeoutSourceNew(IntervalVar) | |
| 2525 | + | ||
| 2671 | 2526 | return cret | |
| 2672 | 2527 | } | |
| 2673 | 2528 | ||
| @@ -2687,6 +2542,7 @@ var xTimeoutSourceNewSeconds func(uint) *Source | |||
| 2687 | 2542 | func TimeoutSourceNewSeconds(IntervalVar uint) *Source { | |
| 2688 | 2543 | ||
| 2689 | 2544 | cret := xTimeoutSourceNewSeconds(IntervalVar) | |
| 2545 | + | ||
| 2690 | 2546 | return cret | |
| 2691 | 2547 | } | |
| 2692 | 2548 | ||
M v4/glib/gmarkup.go +4 -0
| @@ -657,6 +657,7 @@ var xMarkupCollectAttributes func(string, string, string, **Error, MarkupCollect | |||
| 657 | 657 | func MarkupCollectAttributes(ElementNameVar string, AttributeNamesVar string, AttributeValuesVar string, ErrorVar **Error, FirstTypeVar MarkupCollectType, FirstAttrVar string, varArgs ...interface{}) bool { | |
| 658 | 658 | ||
| 659 | 659 | cret := xMarkupCollectAttributes(ElementNameVar, AttributeNamesVar, AttributeValuesVar, ErrorVar, FirstTypeVar, FirstAttrVar, varArgs...) | |
| 660 | + | ||
| 660 | 661 | return cret | |
| 661 | 662 | } | |
| 662 | 663 | ||
| @@ -679,6 +680,7 @@ var xMarkupEscapeText func(string, int) string | |||
| 679 | 680 | func MarkupEscapeText(TextVar string, LengthVar int) string { | |
| 680 | 681 | ||
| 681 | 682 | cret := xMarkupEscapeText(TextVar, LengthVar) | |
| 683 | + | ||
| 682 | 684 | return cret | |
| 683 | 685 | } | |
| 684 | 686 | ||
| @@ -707,6 +709,7 @@ var xMarkupPrintfEscaped func(string, ...interface{}) string | |||
| 707 | 709 | func MarkupPrintfEscaped(FormatVar string, varArgs ...interface{}) string { | |
| 708 | 710 | ||
| 709 | 711 | cret := xMarkupPrintfEscaped(FormatVar, varArgs...) | |
| 712 | + | ||
| 710 | 713 | return cret | |
| 711 | 714 | } | |
| 712 | 715 | ||
| @@ -718,6 +721,7 @@ var xMarkupVprintfEscaped func(string, []interface{}) string | |||
| 718 | 721 | func MarkupVprintfEscaped(FormatVar string, ArgsVar []interface{}) string { | |
| 719 | 722 | ||
| 720 | 723 | cret := xMarkupVprintfEscaped(FormatVar, ArgsVar) | |
| 724 | + | ||
| 721 | 725 | return cret | |
| 722 | 726 | } | |
| 723 | 727 | ||
M v4/glib/gmem.go +15 -0
| @@ -199,6 +199,7 @@ var xAlignedAlloc func(uint, uint, uint) uintptr | |||
| 199 | 199 | func AlignedAlloc(NBlocksVar uint, NBlockBytesVar uint, AlignmentVar uint) uintptr { | |
| 200 | 200 | ||
| 201 | 201 | cret := xAlignedAlloc(NBlocksVar, NBlockBytesVar, AlignmentVar) | |
| 202 | + | ||
| 202 | 203 | return cret | |
| 203 | 204 | } | |
| 204 | 205 | ||
| @@ -209,6 +210,7 @@ var xAlignedAlloc0 func(uint, uint, uint) uintptr | |||
| 209 | 210 | func AlignedAlloc0(NBlocksVar uint, NBlockBytesVar uint, AlignmentVar uint) uintptr { | |
| 210 | 211 | ||
| 211 | 212 | cret := xAlignedAlloc0(NBlocksVar, NBlockBytesVar, AlignmentVar) | |
| 213 | + | ||
| 212 | 214 | return cret | |
| 213 | 215 | } | |
| 214 | 216 | ||
| @@ -348,6 +350,7 @@ var xMalloc func(uint) uintptr | |||
| 348 | 350 | func Malloc(NBytesVar uint) uintptr { | |
| 349 | 351 | ||
| 350 | 352 | cret := xMalloc(NBytesVar) | |
| 353 | + | ||
| 351 | 354 | return cret | |
| 352 | 355 | } | |
| 353 | 356 | ||
| @@ -361,6 +364,7 @@ var xMalloc0 func(uint) uintptr | |||
| 361 | 364 | func Malloc0(NBytesVar uint) uintptr { | |
| 362 | 365 | ||
| 363 | 366 | cret := xMalloc0(NBytesVar) | |
| 367 | + | ||
| 364 | 368 | return cret | |
| 365 | 369 | } | |
| 366 | 370 | ||
| @@ -374,6 +378,7 @@ var xMalloc0N func(uint, uint) uintptr | |||
| 374 | 378 | func Malloc0N(NBlocksVar uint, NBlockBytesVar uint) uintptr { | |
| 375 | 379 | ||
| 376 | 380 | cret := xMalloc0N(NBlocksVar, NBlockBytesVar) | |
| 381 | + | ||
| 377 | 382 | return cret | |
| 378 | 383 | } | |
| 379 | 384 | ||
| @@ -387,6 +392,7 @@ var xMallocN func(uint, uint) uintptr | |||
| 387 | 392 | func MallocN(NBlocksVar uint, NBlockBytesVar uint) uintptr { | |
| 388 | 393 | ||
| 389 | 394 | cret := xMallocN(NBlocksVar, NBlockBytesVar) | |
| 395 | + | ||
| 390 | 396 | return cret | |
| 391 | 397 | } | |
| 392 | 398 | ||
| @@ -400,6 +406,7 @@ var xMemIsSystemMalloc func() bool | |||
| 400 | 406 | func MemIsSystemMalloc() bool { | |
| 401 | 407 | ||
| 402 | 408 | cret := xMemIsSystemMalloc() | |
| 409 | + | ||
| 403 | 410 | return cret | |
| 404 | 411 | } | |
| 405 | 412 | ||
| @@ -439,6 +446,7 @@ var xRealloc func(uintptr, uint) uintptr | |||
| 439 | 446 | func Realloc(MemVar uintptr, NBytesVar uint) uintptr { | |
| 440 | 447 | ||
| 441 | 448 | cret := xRealloc(MemVar, NBytesVar) | |
| 449 | + | ||
| 442 | 450 | return cret | |
| 443 | 451 | } | |
| 444 | 452 | ||
| @@ -452,6 +460,7 @@ var xReallocN func(uintptr, uint, uint) uintptr | |||
| 452 | 460 | func ReallocN(MemVar uintptr, NBlocksVar uint, NBlockBytesVar uint) uintptr { | |
| 453 | 461 | ||
| 454 | 462 | cret := xReallocN(MemVar, NBlocksVar, NBlockBytesVar) | |
| 463 | + | ||
| 455 | 464 | return cret | |
| 456 | 465 | } | |
| 457 | 466 | ||
| @@ -462,6 +471,7 @@ var xTryMalloc func(uint) uintptr | |||
| 462 | 471 | func TryMalloc(NBytesVar uint) uintptr { | |
| 463 | 472 | ||
| 464 | 473 | cret := xTryMalloc(NBytesVar) | |
| 474 | + | ||
| 465 | 475 | return cret | |
| 466 | 476 | } | |
| 467 | 477 | ||
| @@ -472,6 +482,7 @@ var xTryMalloc0 func(uint) uintptr | |||
| 472 | 482 | func TryMalloc0(NBytesVar uint) uintptr { | |
| 473 | 483 | ||
| 474 | 484 | cret := xTryMalloc0(NBytesVar) | |
| 485 | + | ||
| 475 | 486 | return cret | |
| 476 | 487 | } | |
| 477 | 488 | ||
| @@ -482,6 +493,7 @@ var xTryMalloc0N func(uint, uint) uintptr | |||
| 482 | 493 | func TryMalloc0N(NBlocksVar uint, NBlockBytesVar uint) uintptr { | |
| 483 | 494 | ||
| 484 | 495 | cret := xTryMalloc0N(NBlocksVar, NBlockBytesVar) | |
| 496 | + | ||
| 485 | 497 | return cret | |
| 486 | 498 | } | |
| 487 | 499 | ||
| @@ -492,6 +504,7 @@ var xTryMallocN func(uint, uint) uintptr | |||
| 492 | 504 | func TryMallocN(NBlocksVar uint, NBlockBytesVar uint) uintptr { | |
| 493 | 505 | ||
| 494 | 506 | cret := xTryMallocN(NBlocksVar, NBlockBytesVar) | |
| 507 | + | ||
| 495 | 508 | return cret | |
| 496 | 509 | } | |
| 497 | 510 | ||
| @@ -505,6 +518,7 @@ var xTryRealloc func(uintptr, uint) uintptr | |||
| 505 | 518 | func TryRealloc(MemVar uintptr, NBytesVar uint) uintptr { | |
| 506 | 519 | ||
| 507 | 520 | cret := xTryRealloc(MemVar, NBytesVar) | |
| 521 | + | ||
| 508 | 522 | return cret | |
| 509 | 523 | } | |
| 510 | 524 | ||
| @@ -515,6 +529,7 @@ var xTryReallocN func(uintptr, uint, uint) uintptr | |||
| 515 | 529 | func TryReallocN(MemVar uintptr, NBlocksVar uint, NBlockBytesVar uint) uintptr { | |
| 516 | 530 | ||
| 517 | 531 | cret := xTryReallocN(MemVar, NBlocksVar, NBlockBytesVar) | |
| 532 | + | ||
| 518 | 533 | return cret | |
| 519 | 534 | } | |
| 520 | 535 | ||
M v4/glib/gmessages.go +18 -0
| @@ -263,6 +263,7 @@ var xLogGetAlwaysFatal func() LogLevelFlags | |||
| 263 | 263 | func LogGetAlwaysFatal() LogLevelFlags { | |
| 264 | 264 | ||
| 265 | 265 | cret := xLogGetAlwaysFatal() | |
| 266 | + | ||
| 266 | 267 | return cret | |
| 267 | 268 | } | |
| 268 | 269 | ||
| @@ -280,6 +281,7 @@ var xLogGetDebugEnabled func() bool | |||
| 280 | 281 | func LogGetDebugEnabled() bool { | |
| 281 | 282 | ||
| 282 | 283 | cret := xLogGetDebugEnabled() | |
| 284 | + | ||
| 283 | 285 | return cret | |
| 284 | 286 | } | |
| 285 | 287 | ||
| @@ -317,6 +319,7 @@ var xLogSetAlwaysFatal func(LogLevelFlags) LogLevelFlags | |||
| 317 | 319 | func LogSetAlwaysFatal(FatalMaskVar LogLevelFlags) LogLevelFlags { | |
| 318 | 320 | ||
| 319 | 321 | cret := xLogSetAlwaysFatal(FatalMaskVar) | |
| 322 | + | ||
| 320 | 323 | return cret | |
| 321 | 324 | } | |
| 322 | 325 | ||
| @@ -364,6 +367,7 @@ func LogSetDefaultHandler(LogFuncVar *LogFunc, UserDataVar uintptr) uintptr { | |||
| 364 | 367 | } | |
| 365 | 368 | ||
| 366 | 369 | cret := xLogSetDefaultHandler(LogFuncVarRef, UserDataVar) | |
| 370 | + | ||
| 367 | 371 | return cret | |
| 368 | 372 | } | |
| 369 | 373 | ||
| @@ -386,6 +390,7 @@ var xLogSetFatalMask func(string, LogLevelFlags) LogLevelFlags | |||
| 386 | 390 | func LogSetFatalMask(LogDomainVar string, FatalMaskVar LogLevelFlags) LogLevelFlags { | |
| 387 | 391 | ||
| 388 | 392 | cret := xLogSetFatalMask(LogDomainVar, FatalMaskVar) | |
| 393 | + | ||
| 389 | 394 | return cret | |
| 390 | 395 | } | |
| 391 | 396 | ||
| @@ -455,6 +460,7 @@ func LogSetHandler(LogDomainVar *string, LogLevelsVar LogLevelFlags, LogFuncVar | |||
| 455 | 460 | defer core.GFreeNullable(LogDomainVarPtr) | |
| 456 | 461 | ||
| 457 | 462 | cret := xLogSetHandler(LogDomainVarPtr, LogLevelsVar, LogFuncVarRef, UserDataVar) | |
| 463 | + | ||
| 458 | 464 | return cret | |
| 459 | 465 | } | |
| 460 | 466 | ||
| @@ -503,6 +509,7 @@ func LogSetHandlerFull(LogDomainVar *string, LogLevelsVar LogLevelFlags, LogFunc | |||
| 503 | 509 | defer core.GFreeNullable(LogDomainVarPtr) | |
| 504 | 510 | ||
| 505 | 511 | cret := xLogSetHandlerFull(LogDomainVarPtr, LogLevelsVar, LogFuncVarRef, UserDataVar, DestroyVarRef) | |
| 512 | + | ||
| 506 | 513 | return cret | |
| 507 | 514 | } | |
| 508 | 515 | ||
| @@ -736,6 +743,7 @@ var xLogWriterDefault func(LogLevelFlags, []LogField, uint, uintptr) LogWriterOu | |||
| 736 | 743 | func LogWriterDefault(LogLevelVar LogLevelFlags, FieldsVar []LogField, NFieldsVar uint, UserDataVar uintptr) LogWriterOutput { | |
| 737 | 744 | ||
| 738 | 745 | cret := xLogWriterDefault(LogLevelVar, FieldsVar, NFieldsVar, UserDataVar) | |
| 746 | + | ||
| 739 | 747 | return cret | |
| 740 | 748 | } | |
| 741 | 749 | ||
| @@ -816,6 +824,7 @@ func LogWriterDefaultWouldDrop(LogLevelVar LogLevelFlags, LogDomainVar *string) | |||
| 816 | 824 | defer core.GFreeNullable(LogDomainVarPtr) | |
| 817 | 825 | ||
| 818 | 826 | cret := xLogWriterDefaultWouldDrop(LogLevelVar, LogDomainVarPtr) | |
| 827 | + | ||
| 819 | 828 | return cret | |
| 820 | 829 | } | |
| 821 | 830 | ||
| @@ -835,6 +844,7 @@ var xLogWriterFormatFields func(LogLevelFlags, []LogField, uint, bool) string | |||
| 835 | 844 | func LogWriterFormatFields(LogLevelVar LogLevelFlags, FieldsVar []LogField, NFieldsVar uint, UseColorVar bool) string { | |
| 836 | 845 | ||
| 837 | 846 | cret := xLogWriterFormatFields(LogLevelVar, FieldsVar, NFieldsVar, UseColorVar) | |
| 847 | + | ||
| 838 | 848 | return cret | |
| 839 | 849 | } | |
| 840 | 850 | ||
| @@ -852,6 +862,7 @@ var xLogWriterIsJournald func(int) bool | |||
| 852 | 862 | func LogWriterIsJournald(OutputFdVar int) bool { | |
| 853 | 863 | ||
| 854 | 864 | cret := xLogWriterIsJournald(OutputFdVar) | |
| 865 | + | ||
| 855 | 866 | return cret | |
| 856 | 867 | } | |
| 857 | 868 | ||
| @@ -871,6 +882,7 @@ var xLogWriterJournald func(LogLevelFlags, []LogField, uint, uintptr) LogWriterO | |||
| 871 | 882 | func LogWriterJournald(LogLevelVar LogLevelFlags, FieldsVar []LogField, NFieldsVar uint, UserDataVar uintptr) LogWriterOutput { | |
| 872 | 883 | ||
| 873 | 884 | cret := xLogWriterJournald(LogLevelVar, FieldsVar, NFieldsVar, UserDataVar) | |
| 885 | + | ||
| 874 | 886 | return cret | |
| 875 | 887 | } | |
| 876 | 888 | ||
| @@ -896,6 +908,7 @@ var xLogWriterStandardStreams func(LogLevelFlags, []LogField, uint, uintptr) Log | |||
| 896 | 908 | func LogWriterStandardStreams(LogLevelVar LogLevelFlags, FieldsVar []LogField, NFieldsVar uint, UserDataVar uintptr) LogWriterOutput { | |
| 897 | 909 | ||
| 898 | 910 | cret := xLogWriterStandardStreams(LogLevelVar, FieldsVar, NFieldsVar, UserDataVar) | |
| 911 | + | ||
| 899 | 912 | return cret | |
| 900 | 913 | } | |
| 901 | 914 | ||
| @@ -908,6 +921,7 @@ var xLogWriterSupportsColor func(int) bool | |||
| 908 | 921 | func LogWriterSupportsColor(OutputFdVar int) bool { | |
| 909 | 922 | ||
| 910 | 923 | cret := xLogWriterSupportsColor(OutputFdVar) | |
| 924 | + | ||
| 911 | 925 | return cret | |
| 912 | 926 | } | |
| 913 | 927 | ||
| @@ -928,6 +942,7 @@ var xLogWriterSyslog func(LogLevelFlags, []LogField, uint, uintptr) LogWriterOut | |||
| 928 | 942 | func LogWriterSyslog(LogLevelVar LogLevelFlags, FieldsVar []LogField, NFieldsVar uint, UserDataVar uintptr) LogWriterOutput { | |
| 929 | 943 | ||
| 930 | 944 | cret := xLogWriterSyslog(LogLevelVar, FieldsVar, NFieldsVar, UserDataVar) | |
| 945 | + | ||
| 931 | 946 | return cret | |
| 932 | 947 | } | |
| 933 | 948 | ||
| @@ -1008,6 +1023,7 @@ var xPrintfStringUpperBound func(string, []interface{}) uint | |||
| 1008 | 1023 | func PrintfStringUpperBound(FormatVar string, ArgsVar []interface{}) uint { | |
| 1009 | 1024 | ||
| 1010 | 1025 | cret := xPrintfStringUpperBound(FormatVar, ArgsVar) | |
| 1026 | + | ||
| 1011 | 1027 | return cret | |
| 1012 | 1028 | } | |
| 1013 | 1029 | ||
| @@ -1062,6 +1078,7 @@ func SetPrintHandler(FuncVar *PrintFunc) uintptr { | |||
| 1062 | 1078 | } | |
| 1063 | 1079 | ||
| 1064 | 1080 | cret := xSetPrintHandler(FuncVarRef) | |
| 1081 | + | ||
| 1065 | 1082 | return cret | |
| 1066 | 1083 | } | |
| 1067 | 1084 | ||
| @@ -1100,6 +1117,7 @@ func SetPrinterrHandler(FuncVar *PrintFunc) uintptr { | |||
| 1100 | 1117 | } | |
| 1101 | 1118 | ||
| 1102 | 1119 | cret := xSetPrinterrHandler(FuncVarRef) | |
| 1120 | + | ||
| 1103 | 1121 | return cret | |
| 1104 | 1122 | } | |
| 1105 | 1123 | ||
M v4/glib/gpathbuf.go +1 -0
| @@ -277,6 +277,7 @@ var xPathBufEqual func(uintptr, uintptr) bool | |||
| 277 | 277 | func PathBufEqual(V1Var uintptr, V2Var uintptr) bool { | |
| 278 | 278 | ||
| 279 | 279 | cret := xPathBufEqual(V1Var, V2Var) | |
| 280 | + | ||
| 280 | 281 | return cret | |
| 281 | 282 | } | |
| 282 | 283 | ||
M v4/glib/gpattern.go +3 -0
| @@ -147,6 +147,7 @@ func PatternMatch(PspecVar *PatternSpec, StringLengthVar uint, StringVar string, | |||
| 147 | 147 | defer core.GFreeNullable(StringReversedVarPtr) | |
| 148 | 148 | ||
| 149 | 149 | cret := xPatternMatch(PspecVar, StringLengthVar, StringVar, StringReversedVarPtr) | |
| 150 | + | ||
| 150 | 151 | return cret | |
| 151 | 152 | } | |
| 152 | 153 | ||
| @@ -161,6 +162,7 @@ var xPatternMatchSimple func(string, string) bool | |||
| 161 | 162 | func PatternMatchSimple(PatternVar string, StringVar string) bool { | |
| 162 | 163 | ||
| 163 | 164 | cret := xPatternMatchSimple(PatternVar, StringVar) | |
| 165 | + | ||
| 164 | 166 | return cret | |
| 165 | 167 | } | |
| 166 | 168 | ||
| @@ -174,6 +176,7 @@ var xPatternMatchString func(*PatternSpec, string) bool | |||
| 174 | 176 | func PatternMatchString(PspecVar *PatternSpec, StringVar string) bool { | |
| 175 | 177 | ||
| 176 | 178 | cret := xPatternMatchString(PspecVar, StringVar) | |
| 179 | + | ||
| 177 | 180 | return cret | |
| 178 | 181 | } | |
| 179 | 182 | ||
M v4/glib/gpoll.go +1 -0
| @@ -58,6 +58,7 @@ var xPoll func(*PollFD, uint, int) int | |||
| 58 | 58 | func Poll(FdsVar *PollFD, NfdsVar uint, TimeoutVar int) int { | |
| 59 | 59 | ||
| 60 | 60 | cret := xPoll(FdsVar, NfdsVar, TimeoutVar) | |
| 61 | + | ||
| 61 | 62 | return cret | |
| 62 | 63 | } | |
| 63 | 64 | ||
M v4/glib/gprimes.go +1 -0
| @@ -17,6 +17,7 @@ var xSpacedPrimesClosest func(uint) uint | |||
| 17 | 17 | func SpacedPrimesClosest(NumVar uint) uint { | |
| 18 | 18 | ||
| 19 | 19 | cret := xSpacedPrimesClosest(NumVar) | |
| 20 | + | ||
| 20 | 21 | return cret | |
| 21 | 22 | } | |
| 22 | 23 | ||
M v4/glib/gprintf.go +7 -0
| @@ -15,6 +15,7 @@ var xFprintf func(uintptr, string, ...interface{}) int | |||
| 15 | 15 | func Fprintf(FileVar uintptr, FormatVar string, varArgs ...interface{}) int { | |
| 16 | 16 | ||
| 17 | 17 | cret := xFprintf(FileVar, FormatVar, varArgs...) | |
| 18 | + | ||
| 18 | 19 | return cret | |
| 19 | 20 | } | |
| 20 | 21 | ||
| @@ -31,6 +32,7 @@ var xPrintf func(string, ...interface{}) int | |||
| 31 | 32 | func Printf(FormatVar string, varArgs ...interface{}) int { | |
| 32 | 33 | ||
| 33 | 34 | cret := xPrintf(FormatVar, varArgs...) | |
| 35 | + | ||
| 34 | 36 | return cret | |
| 35 | 37 | } | |
| 36 | 38 | ||
| @@ -48,6 +50,7 @@ var xSprintf func(string, string, ...interface{}) int | |||
| 48 | 50 | func Sprintf(StringVar string, FormatVar string, varArgs ...interface{}) int { | |
| 49 | 51 | ||
| 50 | 52 | cret := xSprintf(StringVar, FormatVar, varArgs...) | |
| 53 | + | ||
| 51 | 54 | return cret | |
| 52 | 55 | } | |
| 53 | 56 | ||
| @@ -67,6 +70,7 @@ var xVasprintf func(*string, string, []interface{}) int | |||
| 67 | 70 | func Vasprintf(StringVar *string, FormatVar string, ArgsVar []interface{}) int { | |
| 68 | 71 | ||
| 69 | 72 | cret := xVasprintf(StringVar, FormatVar, ArgsVar) | |
| 73 | + | ||
| 70 | 74 | return cret | |
| 71 | 75 | } | |
| 72 | 76 | ||
| @@ -79,6 +83,7 @@ var xVfprintf func(uintptr, string, []interface{}) int | |||
| 79 | 83 | func Vfprintf(FileVar uintptr, FormatVar string, ArgsVar []interface{}) int { | |
| 80 | 84 | ||
| 81 | 85 | cret := xVfprintf(FileVar, FormatVar, ArgsVar) | |
| 86 | + | ||
| 82 | 87 | return cret | |
| 83 | 88 | } | |
| 84 | 89 | ||
| @@ -91,6 +96,7 @@ var xVprintf func(string, []interface{}) int | |||
| 91 | 96 | func Vprintf(FormatVar string, ArgsVar []interface{}) int { | |
| 92 | 97 | ||
| 93 | 98 | cret := xVprintf(FormatVar, ArgsVar) | |
| 99 | + | ||
| 94 | 100 | return cret | |
| 95 | 101 | } | |
| 96 | 102 | ||
| @@ -103,6 +109,7 @@ var xVsprintf func(string, string, []interface{}) int | |||
| 103 | 109 | func Vsprintf(StringVar string, FormatVar string, ArgsVar []interface{}) int { | |
| 104 | 110 | ||
| 105 | 111 | cret := xVsprintf(StringVar, FormatVar, ArgsVar) | |
| 112 | + | ||
| 106 | 113 | return cret | |
| 107 | 114 | } | |
| 108 | 115 | ||
M v4/glib/gquark.go +6 -0
| @@ -50,6 +50,7 @@ func InternStaticString(StringVar *string) string { | |||
| 50 | 50 | defer core.GFreeNullable(StringVarPtr) | |
| 51 | 51 | ||
| 52 | 52 | cret := xInternStaticString(StringVarPtr) | |
| 53 | + | ||
| 53 | 54 | return cret | |
| 54 | 55 | } | |
| 55 | 56 | ||
| @@ -68,6 +69,7 @@ func InternString(StringVar *string) string { | |||
| 68 | 69 | defer core.GFreeNullable(StringVarPtr) | |
| 69 | 70 | ||
| 70 | 71 | cret := xInternString(StringVarPtr) | |
| 72 | + | ||
| 71 | 73 | return cret | |
| 72 | 74 | } | |
| 73 | 75 | ||
| @@ -95,6 +97,7 @@ func QuarkFromStaticString(StringVar *string) Quark { | |||
| 95 | 97 | defer core.GFreeNullable(StringVarPtr) | |
| 96 | 98 | ||
| 97 | 99 | cret := xQuarkFromStaticString(StringVarPtr) | |
| 100 | + | ||
| 98 | 101 | return cret | |
| 99 | 102 | } | |
| 100 | 103 | ||
| @@ -113,6 +116,7 @@ func QuarkFromString(StringVar *string) Quark { | |||
| 113 | 116 | defer core.GFreeNullable(StringVarPtr) | |
| 114 | 117 | ||
| 115 | 118 | cret := xQuarkFromString(StringVarPtr) | |
| 119 | + | ||
| 116 | 120 | return cret | |
| 117 | 121 | } | |
| 118 | 122 | ||
| @@ -122,6 +126,7 @@ var xQuarkToString func(Quark) string | |||
| 122 | 126 | func QuarkToString(QuarkVar Quark) string { | |
| 123 | 127 | ||
| 124 | 128 | cret := xQuarkToString(QuarkVar) | |
| 129 | + | ||
| 125 | 130 | return cret | |
| 126 | 131 | } | |
| 127 | 132 | ||
| @@ -141,6 +146,7 @@ func QuarkTryString(StringVar *string) Quark { | |||
| 141 | 146 | defer core.GFreeNullable(StringVarPtr) | |
| 142 | 147 | ||
| 143 | 148 | cret := xQuarkTryString(StringVarPtr) | |
| 149 | + | ||
| 144 | 150 | return cret | |
| 145 | 151 | } | |
| 146 | 152 | ||
M v4/glib/grand.go +4 -0
| @@ -145,6 +145,7 @@ var xRandomDouble func() float64 | |||
| 145 | 145 | func RandomDouble() float64 { | |
| 146 | 146 | ||
| 147 | 147 | cret := xRandomDouble() | |
| 148 | + | ||
| 148 | 149 | return cret | |
| 149 | 150 | } | |
| 150 | 151 | ||
| @@ -155,6 +156,7 @@ var xRandomDoubleRange func(float64, float64) float64 | |||
| 155 | 156 | func RandomDoubleRange(BeginVar float64, EndVar float64) float64 { | |
| 156 | 157 | ||
| 157 | 158 | cret := xRandomDoubleRange(BeginVar, EndVar) | |
| 159 | + | ||
| 158 | 160 | return cret | |
| 159 | 161 | } | |
| 160 | 162 | ||
| @@ -165,6 +167,7 @@ var xRandomInt func() uint32 | |||
| 165 | 167 | func RandomInt() uint32 { | |
| 166 | 168 | ||
| 167 | 169 | cret := xRandomInt() | |
| 170 | + | ||
| 168 | 171 | return cret | |
| 169 | 172 | } | |
| 170 | 173 | ||
| @@ -175,6 +178,7 @@ var xRandomIntRange func(int32, int32) int32 | |||
| 175 | 178 | func RandomIntRange(BeginVar int32, EndVar int32) int32 { | |
| 176 | 179 | ||
| 177 | 180 | cret := xRandomIntRange(BeginVar, EndVar) | |
| 181 | + | ||
| 178 | 182 | return cret | |
| 179 | 183 | } | |
| 180 | 184 | ||
M v4/glib/grcbox.go +10 -0
| @@ -14,6 +14,7 @@ var xAtomicRcBoxAcquire func(uintptr) uintptr | |||
| 14 | 14 | func AtomicRcBoxAcquire(MemBlockVar uintptr) uintptr { | |
| 15 | 15 | ||
| 16 | 16 | cret := xAtomicRcBoxAcquire(MemBlockVar) | |
| 17 | + | ||
| 17 | 18 | return cret | |
| 18 | 19 | } | |
| 19 | 20 | ||
| @@ -30,6 +31,7 @@ var xAtomicRcBoxAlloc func(uint) uintptr | |||
| 30 | 31 | func AtomicRcBoxAlloc(BlockSizeVar uint) uintptr { | |
| 31 | 32 | ||
| 32 | 33 | cret := xAtomicRcBoxAlloc(BlockSizeVar) | |
| 34 | + | ||
| 33 | 35 | return cret | |
| 34 | 36 | } | |
| 35 | 37 | ||
| @@ -48,6 +50,7 @@ var xAtomicRcBoxAlloc0 func(uint) uintptr | |||
| 48 | 50 | func AtomicRcBoxAlloc0(BlockSizeVar uint) uintptr { | |
| 49 | 51 | ||
| 50 | 52 | cret := xAtomicRcBoxAlloc0(BlockSizeVar) | |
| 53 | + | ||
| 51 | 54 | return cret | |
| 52 | 55 | } | |
| 53 | 56 | ||
| @@ -59,6 +62,7 @@ var xAtomicRcBoxDup func(uint, uintptr) uintptr | |||
| 59 | 62 | func AtomicRcBoxDup(BlockSizeVar uint, MemBlockVar uintptr) uintptr { | |
| 60 | 63 | ||
| 61 | 64 | cret := xAtomicRcBoxDup(BlockSizeVar, MemBlockVar) | |
| 65 | + | ||
| 62 | 66 | return cret | |
| 63 | 67 | } | |
| 64 | 68 | ||
| @@ -68,6 +72,7 @@ var xAtomicRcBoxGetSize func(uintptr) uint | |||
| 68 | 72 | func AtomicRcBoxGetSize(MemBlockVar uintptr) uint { | |
| 69 | 73 | ||
| 70 | 74 | cret := xAtomicRcBoxGetSize(MemBlockVar) | |
| 75 | + | ||
| 71 | 76 | return cret | |
| 72 | 77 | } | |
| 73 | 78 | ||
| @@ -122,6 +127,7 @@ var xRcBoxAcquire func(uintptr) uintptr | |||
| 122 | 127 | func RcBoxAcquire(MemBlockVar uintptr) uintptr { | |
| 123 | 128 | ||
| 124 | 129 | cret := xRcBoxAcquire(MemBlockVar) | |
| 130 | + | ||
| 125 | 131 | return cret | |
| 126 | 132 | } | |
| 127 | 133 | ||
| @@ -138,6 +144,7 @@ var xRcBoxAlloc func(uint) uintptr | |||
| 138 | 144 | func RcBoxAlloc(BlockSizeVar uint) uintptr { | |
| 139 | 145 | ||
| 140 | 146 | cret := xRcBoxAlloc(BlockSizeVar) | |
| 147 | + | ||
| 141 | 148 | return cret | |
| 142 | 149 | } | |
| 143 | 150 | ||
| @@ -156,6 +163,7 @@ var xRcBoxAlloc0 func(uint) uintptr | |||
| 156 | 163 | func RcBoxAlloc0(BlockSizeVar uint) uintptr { | |
| 157 | 164 | ||
| 158 | 165 | cret := xRcBoxAlloc0(BlockSizeVar) | |
| 166 | + | ||
| 159 | 167 | return cret | |
| 160 | 168 | } | |
| 161 | 169 | ||
| @@ -167,6 +175,7 @@ var xRcBoxDup func(uint, uintptr) uintptr | |||
| 167 | 175 | func RcBoxDup(BlockSizeVar uint, MemBlockVar uintptr) uintptr { | |
| 168 | 176 | ||
| 169 | 177 | cret := xRcBoxDup(BlockSizeVar, MemBlockVar) | |
| 178 | + | ||
| 170 | 179 | return cret | |
| 171 | 180 | } | |
| 172 | 181 | ||
| @@ -176,6 +185,7 @@ var xRcBoxGetSize func(uintptr) uint | |||
| 176 | 185 | func RcBoxGetSize(MemBlockVar uintptr) uint { | |
| 177 | 186 | ||
| 178 | 187 | cret := xRcBoxGetSize(MemBlockVar) | |
| 188 | + | ||
| 179 | 189 | return cret | |
| 180 | 190 | } | |
| 181 | 191 | ||
M v4/glib/grefcount.go +4 -0
| @@ -53,6 +53,7 @@ var xAtomicRefCountCompare func(int, int) bool | |||
| 53 | 53 | func AtomicRefCountCompare(ArcVar int, ValVar int) bool { | |
| 54 | 54 | ||
| 55 | 55 | cret := xAtomicRefCountCompare(ArcVar, ValVar) | |
| 56 | + | ||
| 56 | 57 | return cret | |
| 57 | 58 | } | |
| 58 | 59 | ||
| @@ -66,6 +67,7 @@ var xAtomicRefCountDec func(int) bool | |||
| 66 | 67 | func AtomicRefCountDec(ArcVar int) bool { | |
| 67 | 68 | ||
| 68 | 69 | cret := xAtomicRefCountDec(ArcVar) | |
| 70 | + | ||
| 69 | 71 | return cret | |
| 70 | 72 | } | |
| 71 | 73 | ||
| @@ -93,6 +95,7 @@ var xRefCountCompare func(int, int) bool | |||
| 93 | 95 | func RefCountCompare(RcVar int, ValVar int) bool { | |
| 94 | 96 | ||
| 95 | 97 | cret := xRefCountCompare(RcVar, ValVar) | |
| 98 | + | ||
| 96 | 99 | return cret | |
| 97 | 100 | } | |
| 98 | 101 | ||
| @@ -106,6 +109,7 @@ var xRefCountDec func(int) bool | |||
| 106 | 109 | func RefCountDec(RcVar int) bool { | |
| 107 | 110 | ||
| 108 | 111 | cret := xRefCountDec(RcVar) | |
| 112 | + | ||
| 109 | 113 | return cret | |
| 110 | 114 | } | |
| 111 | 115 | ||
M v4/glib/grefstring.go +6 -0
| @@ -21,6 +21,7 @@ var xRefStringAcquire func(string) string | |||
| 21 | 21 | func RefStringAcquire(StrVar string) string { | |
| 22 | 22 | ||
| 23 | 23 | cret := xRefStringAcquire(StrVar) | |
| 24 | + | ||
| 24 | 25 | return cret | |
| 25 | 26 | } | |
| 26 | 27 | ||
| @@ -35,6 +36,7 @@ var xRefStringEqual func(string, string) bool | |||
| 35 | 36 | func RefStringEqual(Str1Var string, Str2Var string) bool { | |
| 36 | 37 | ||
| 37 | 38 | cret := xRefStringEqual(Str1Var, Str2Var) | |
| 39 | + | ||
| 38 | 40 | return cret | |
| 39 | 41 | } | |
| 40 | 42 | ||
| @@ -44,6 +46,7 @@ var xRefStringLength func(string) uint | |||
| 44 | 46 | func RefStringLength(StrVar string) uint { | |
| 45 | 47 | ||
| 46 | 48 | cret := xRefStringLength(StrVar) | |
| 49 | + | ||
| 47 | 50 | return cret | |
| 48 | 51 | } | |
| 49 | 52 | ||
| @@ -54,6 +57,7 @@ var xRefStringNew func(string) string | |||
| 54 | 57 | func RefStringNew(StrVar string) string { | |
| 55 | 58 | ||
| 56 | 59 | cret := xRefStringNew(StrVar) | |
| 60 | + | ||
| 57 | 61 | return cret | |
| 58 | 62 | } | |
| 59 | 63 | ||
| @@ -68,6 +72,7 @@ var xRefStringNewIntern func(string) string | |||
| 68 | 72 | func RefStringNewIntern(StrVar string) string { | |
| 69 | 73 | ||
| 70 | 74 | cret := xRefStringNewIntern(StrVar) | |
| 75 | + | ||
| 71 | 76 | return cret | |
| 72 | 77 | } | |
| 73 | 78 | ||
| @@ -81,6 +86,7 @@ var xRefStringNewLen func(string, int) string | |||
| 81 | 86 | func RefStringNewLen(StrVar string, LenVar int) string { | |
| 82 | 87 | ||
| 83 | 88 | cret := xRefStringNewLen(StrVar, LenVar) | |
| 89 | + | ||
| 84 | 90 | return cret | |
| 85 | 91 | } | |
| 86 | 92 | ||
M v4/glib/gregex.go +5 -0
| @@ -1504,6 +1504,7 @@ func RegexCheckReplacement(ReplacementVar string, HasReferencesVar *bool) (bool, | |||
| 1504 | 1504 | var cerr *Error | |
| 1505 | 1505 | ||
| 1506 | 1506 | cret := xRegexCheckReplacement(ReplacementVar, HasReferencesVar, &cerr) | |
| 1507 | + | ||
| 1507 | 1508 | if cerr == nil { | |
| 1508 | 1509 | return cret, nil | |
| 1509 | 1510 | } | |
| @@ -1521,6 +1522,7 @@ var xRegexEscapeNul func(string, int) string | |||
| 1521 | 1522 | func RegexEscapeNul(StringVar string, LengthVar int) string { | |
| 1522 | 1523 | ||
| 1523 | 1524 | cret := xRegexEscapeNul(StringVar, LengthVar) | |
| 1525 | + | ||
| 1524 | 1526 | return cret | |
| 1525 | 1527 | } | |
| 1526 | 1528 | ||
| @@ -1536,6 +1538,7 @@ var xRegexEscapeString func(string, int) string | |||
| 1536 | 1538 | func RegexEscapeString(StringVar string, LengthVar int) string { | |
| 1537 | 1539 | ||
| 1538 | 1540 | cret := xRegexEscapeString(StringVar, LengthVar) | |
| 1541 | + | ||
| 1539 | 1542 | return cret | |
| 1540 | 1543 | } | |
| 1541 | 1544 | ||
| @@ -1554,6 +1557,7 @@ var xRegexMatchSimple func(string, string, RegexCompileFlags, RegexMatchFlags) b | |||
| 1554 | 1557 | func RegexMatchSimple(PatternVar string, StringVar string, CompileOptionsVar RegexCompileFlags, MatchOptionsVar RegexMatchFlags) bool { | |
| 1555 | 1558 | ||
| 1556 | 1559 | cret := xRegexMatchSimple(PatternVar, StringVar, CompileOptionsVar, MatchOptionsVar) | |
| 1560 | + | ||
| 1557 | 1561 | return cret | |
| 1558 | 1562 | } | |
| 1559 | 1563 | ||
| @@ -1589,6 +1593,7 @@ var xRegexSplitSimple func(string, string, RegexCompileFlags, RegexMatchFlags) [ | |||
| 1589 | 1593 | func RegexSplitSimple(PatternVar string, StringVar string, CompileOptionsVar RegexCompileFlags, MatchOptionsVar RegexMatchFlags) []string { | |
| 1590 | 1594 | ||
| 1591 | 1595 | cret := xRegexSplitSimple(PatternVar, StringVar, CompileOptionsVar, MatchOptionsVar) | |
| 1596 | + | ||
| 1592 | 1597 | return cret | |
| 1593 | 1598 | } | |
| 1594 | 1599 | ||
M v4/glib/gsequence.go +3 -0
| @@ -522,6 +522,7 @@ var xSequenceGet func(*SequenceIter) uintptr | |||
| 522 | 522 | func SequenceGet(IterVar *SequenceIter) uintptr { | |
| 523 | 523 | ||
| 524 | 524 | cret := xSequenceGet(IterVar) | |
| 525 | + | ||
| 525 | 526 | return cret | |
| 526 | 527 | } | |
| 527 | 528 | ||
| @@ -531,6 +532,7 @@ var xSequenceInsertBefore func(*SequenceIter, uintptr) *SequenceIter | |||
| 531 | 532 | func SequenceInsertBefore(IterVar *SequenceIter, DataVar uintptr) *SequenceIter { | |
| 532 | 533 | ||
| 533 | 534 | cret := xSequenceInsertBefore(IterVar, DataVar) | |
| 535 | + | ||
| 534 | 536 | return cret | |
| 535 | 537 | } | |
| 536 | 538 | ||
| @@ -573,6 +575,7 @@ var xSequenceRangeGetMidpoint func(*SequenceIter, *SequenceIter) *SequenceIter | |||
| 573 | 575 | func SequenceRangeGetMidpoint(BeginVar *SequenceIter, EndVar *SequenceIter) *SequenceIter { | |
| 574 | 576 | ||
| 575 | 577 | cret := xSequenceRangeGetMidpoint(BeginVar, EndVar) | |
| 578 | + | ||
| 576 | 579 | return cret | |
| 577 | 580 | } | |
| 578 | 581 | ||
M v4/glib/gshell.go +3 -0
| @@ -43,6 +43,7 @@ func ShellParseArgv(CommandLineVar string, ArgcpVar *int, ArgvpVar *[]string) (b | |||
| 43 | 43 | var cerr *Error | |
| 44 | 44 | ||
| 45 | 45 | cret := xShellParseArgv(CommandLineVar, ArgcpVar, ArgvpVar, &cerr) | |
| 46 | + | ||
| 46 | 47 | if cerr == nil { | |
| 47 | 48 | return cret, nil | |
| 48 | 49 | } | |
| @@ -65,6 +66,7 @@ var xShellQuote func(string) string | |||
| 65 | 66 | func ShellQuote(UnquotedStringVar string) string { | |
| 66 | 67 | ||
| 67 | 68 | cret := xShellQuote(UnquotedStringVar) | |
| 69 | + | ||
| 68 | 70 | return cret | |
| 69 | 71 | } | |
| 70 | 72 | ||
| @@ -101,6 +103,7 @@ func ShellUnquote(QuotedStringVar string) (string, error) { | |||
| 101 | 103 | var cerr *Error | |
| 102 | 104 | ||
| 103 | 105 | cret := xShellUnquote(QuotedStringVar, &cerr) | |
| 106 | + | ||
| 104 | 107 | if cerr == nil { | |
| 105 | 108 | return cret, nil | |
| 106 | 109 | } | |
M v4/glib/gslice.go +5 -0
| @@ -34,6 +34,7 @@ var xSliceAlloc func(uint) uintptr | |||
| 34 | 34 | func SliceAlloc(BlockSizeVar uint) uintptr { | |
| 35 | 35 | ||
| 36 | 36 | cret := xSliceAlloc(BlockSizeVar) | |
| 37 | + | ||
| 37 | 38 | return cret | |
| 38 | 39 | } | |
| 39 | 40 | ||
| @@ -47,6 +48,7 @@ var xSliceAlloc0 func(uint) uintptr | |||
| 47 | 48 | func SliceAlloc0(BlockSizeVar uint) uintptr { | |
| 48 | 49 | ||
| 49 | 50 | cret := xSliceAlloc0(BlockSizeVar) | |
| 51 | + | ||
| 50 | 52 | return cret | |
| 51 | 53 | } | |
| 52 | 54 | ||
| @@ -62,6 +64,7 @@ var xSliceCopy func(uint, uintptr) uintptr | |||
| 62 | 64 | func SliceCopy(BlockSizeVar uint, MemBlockVar uintptr) uintptr { | |
| 63 | 65 | ||
| 64 | 66 | cret := xSliceCopy(BlockSizeVar, MemBlockVar) | |
| 67 | + | ||
| 65 | 68 | return cret | |
| 66 | 69 | } | |
| 67 | 70 | ||
| @@ -111,6 +114,7 @@ var xSliceGetConfig func(SliceConfig) int64 | |||
| 111 | 114 | func SliceGetConfig(CkeyVar SliceConfig) int64 { | |
| 112 | 115 | ||
| 113 | 116 | cret := xSliceGetConfig(CkeyVar) | |
| 117 | + | ||
| 114 | 118 | return cret | |
| 115 | 119 | } | |
| 116 | 120 | ||
| @@ -119,6 +123,7 @@ var xSliceGetConfigState func(SliceConfig, int64, uint) int64 | |||
| 119 | 123 | func SliceGetConfigState(CkeyVar SliceConfig, AddressVar int64, NValuesVar uint) int64 { | |
| 120 | 124 | ||
| 121 | 125 | cret := xSliceGetConfigState(CkeyVar, AddressVar, NValuesVar) | |
| 126 | + | ||
| 122 | 127 | return cret | |
| 123 | 128 | } | |
| 124 | 129 | ||
M v4/glib/gspawn.go +9 -0
| @@ -177,6 +177,7 @@ func SpawnAsync(WorkingDirectoryVar *string, ArgvVar []string, EnvpVar []string, | |||
| 177 | 177 | defer core.GFreeNullable(WorkingDirectoryVarPtr) | |
| 178 | 178 | ||
| 179 | 179 | cret := xSpawnAsync(WorkingDirectoryVarPtr, ArgvVar, EnvpVar, FlagsVar, ChildSetupVarRef, UserDataVar, ChildPidVar, &cerr) | |
| 180 | + | ||
| 180 | 181 | if cerr == nil { | |
| 181 | 182 | return cret, nil | |
| 182 | 183 | } | |
| @@ -212,6 +213,7 @@ func SpawnAsyncWithFds(WorkingDirectoryVar *string, ArgvVar []string, EnvpVar [] | |||
| 212 | 213 | defer core.GFreeNullable(WorkingDirectoryVarPtr) | |
| 213 | 214 | ||
| 214 | 215 | cret := xSpawnAsyncWithFds(WorkingDirectoryVarPtr, ArgvVar, EnvpVar, FlagsVar, ChildSetupVarRef, UserDataVar, ChildPidVar, StdinFdVar, StdoutFdVar, StderrFdVar, &cerr) | |
| 216 | + | ||
| 215 | 217 | if cerr == nil { | |
| 216 | 218 | return cret, nil | |
| 217 | 219 | } | |
| @@ -245,6 +247,7 @@ func SpawnAsyncWithPipes(WorkingDirectoryVar *string, ArgvVar []string, EnvpVar | |||
| 245 | 247 | defer core.GFreeNullable(WorkingDirectoryVarPtr) | |
| 246 | 248 | ||
| 247 | 249 | cret := xSpawnAsyncWithPipes(WorkingDirectoryVarPtr, ArgvVar, EnvpVar, FlagsVar, ChildSetupVarRef, UserDataVar, ChildPidVar, StandardInputVar, StandardOutputVar, StandardErrorVar, &cerr) | |
| 250 | + | ||
| 248 | 251 | if cerr == nil { | |
| 249 | 252 | return cret, nil | |
| 250 | 253 | } | |
| @@ -470,6 +473,7 @@ func SpawnAsyncWithPipesAndFds(WorkingDirectoryVar *string, ArgvVar []string, En | |||
| 470 | 473 | defer core.GFreeNullable(WorkingDirectoryVarPtr) | |
| 471 | 474 | ||
| 472 | 475 | cret := xSpawnAsyncWithPipesAndFds(WorkingDirectoryVarPtr, ArgvVar, EnvpVar, FlagsVar, ChildSetupVarRef, UserDataVar, StdinFdVar, StdoutFdVar, StderrFdVar, SourceFdsVar, TargetFdsVar, NFdsVar, ChildPidOutVar, StdinPipeOutVar, StdoutPipeOutVar, StderrPipeOutVar, &cerr) | |
| 476 | + | ||
| 473 | 477 | if cerr == nil { | |
| 474 | 478 | return cret, nil | |
| 475 | 479 | } | |
| @@ -491,6 +495,7 @@ func SpawnCheckExitStatus(WaitStatusVar int) (bool, error) { | |||
| 491 | 495 | var cerr *Error | |
| 492 | 496 | ||
| 493 | 497 | cret := xSpawnCheckExitStatus(WaitStatusVar, &cerr) | |
| 498 | + | ||
| 494 | 499 | if cerr == nil { | |
| 495 | 500 | return cret, nil | |
| 496 | 501 | } | |
| @@ -543,6 +548,7 @@ func SpawnCheckWaitStatus(WaitStatusVar int) (bool, error) { | |||
| 543 | 548 | var cerr *Error | |
| 544 | 549 | ||
| 545 | 550 | cret := xSpawnCheckWaitStatus(WaitStatusVar, &cerr) | |
| 551 | + | ||
| 546 | 552 | if cerr == nil { | |
| 547 | 553 | return cret, nil | |
| 548 | 554 | } | |
| @@ -578,6 +584,7 @@ func SpawnCommandLineAsync(CommandLineVar string) (bool, error) { | |||
| 578 | 584 | var cerr *Error | |
| 579 | 585 | ||
| 580 | 586 | cret := xSpawnCommandLineAsync(CommandLineVar, &cerr) | |
| 587 | + | ||
| 581 | 588 | if cerr == nil { | |
| 582 | 589 | return cret, nil | |
| 583 | 590 | } | |
| @@ -620,6 +627,7 @@ func SpawnCommandLineSync(CommandLineVar string, StandardOutputVar *[]byte, Stan | |||
| 620 | 627 | var cerr *Error | |
| 621 | 628 | ||
| 622 | 629 | cret := xSpawnCommandLineSync(CommandLineVar, StandardOutputVar, StandardErrorVar, WaitStatusVar, &cerr) | |
| 630 | + | ||
| 623 | 631 | if cerr == nil { | |
| 624 | 632 | return cret, nil | |
| 625 | 633 | } | |
| @@ -674,6 +682,7 @@ func SpawnSync(WorkingDirectoryVar *string, ArgvVar []string, EnvpVar []string, | |||
| 674 | 682 | defer core.GFreeNullable(WorkingDirectoryVarPtr) | |
| 675 | 683 | ||
| 676 | 684 | cret := xSpawnSync(WorkingDirectoryVarPtr, ArgvVar, EnvpVar, FlagsVar, ChildSetupVarRef, UserDataVar, StandardOutputVar, StandardErrorVar, WaitStatusVar, &cerr) | |
| 685 | + | ||
| 677 | 686 | if cerr == nil { | |
| 678 | 687 | return cret, nil | |
| 679 | 688 | } | |
M v4/glib/gstdio.go +17 -0
| @@ -38,6 +38,7 @@ var xAccess func(string, int) int | |||
| 38 | 38 | func Access(FilenameVar string, ModeVar int) int { | |
| 39 | 39 | ||
| 40 | 40 | cret := xAccess(FilenameVar, ModeVar) | |
| 41 | + | ||
| 41 | 42 | return cret | |
| 42 | 43 | } | |
| 43 | 44 | ||
| @@ -50,6 +51,7 @@ var xChdir func(string) int | |||
| 50 | 51 | func Chdir(PathVar string) int { | |
| 51 | 52 | ||
| 52 | 53 | cret := xChdir(PathVar) | |
| 54 | + | ||
| 53 | 55 | return cret | |
| 54 | 56 | } | |
| 55 | 57 | ||
| @@ -68,6 +70,7 @@ var xChmod func(string, int) int | |||
| 68 | 70 | func Chmod(FilenameVar string, ModeVar int) int { | |
| 69 | 71 | ||
| 70 | 72 | cret := xChmod(FilenameVar, ModeVar) | |
| 73 | + | ||
| 71 | 74 | return cret | |
| 72 | 75 | } | |
| 73 | 76 | ||
| @@ -94,6 +97,7 @@ func Close(FdVar int) (bool, error) { | |||
| 94 | 97 | var cerr *Error | |
| 95 | 98 | ||
| 96 | 99 | cret := xClose(FdVar, &cerr) | |
| 100 | + | ||
| 97 | 101 | if cerr == nil { | |
| 98 | 102 | return cret, nil | |
| 99 | 103 | } | |
| @@ -125,6 +129,7 @@ var xCreat func(string, int) int | |||
| 125 | 129 | func Creat(FilenameVar string, ModeVar int) int { | |
| 126 | 130 | ||
| 127 | 131 | cret := xCreat(FilenameVar, ModeVar) | |
| 132 | + | ||
| 128 | 133 | return cret | |
| 129 | 134 | } | |
| 130 | 135 | ||
| @@ -156,6 +161,7 @@ var xFopen func(string, string) uintptr | |||
| 156 | 161 | func Fopen(FilenameVar string, ModeVar string) uintptr { | |
| 157 | 162 | ||
| 158 | 163 | cret := xFopen(FilenameVar, ModeVar) | |
| 164 | + | ||
| 159 | 165 | return cret | |
| 160 | 166 | } | |
| 161 | 167 | ||
| @@ -171,6 +177,7 @@ var xFreopen func(string, string, uintptr) uintptr | |||
| 171 | 177 | func Freopen(FilenameVar string, ModeVar string, StreamVar uintptr) uintptr { | |
| 172 | 178 | ||
| 173 | 179 | cret := xFreopen(FilenameVar, ModeVar, StreamVar) | |
| 180 | + | ||
| 174 | 181 | return cret | |
| 175 | 182 | } | |
| 176 | 183 | ||
| @@ -187,6 +194,7 @@ var xFsync func(int) int | |||
| 187 | 194 | func Fsync(FdVar int) int { | |
| 188 | 195 | ||
| 189 | 196 | cret := xFsync(FdVar) | |
| 197 | + | ||
| 190 | 198 | return cret | |
| 191 | 199 | } | |
| 192 | 200 | ||
| @@ -202,6 +210,7 @@ var xLstat func(string, *StatBuf) int | |||
| 202 | 210 | func Lstat(FilenameVar string, BufVar *StatBuf) int { | |
| 203 | 211 | ||
| 204 | 212 | cret := xLstat(FilenameVar, BufVar) | |
| 213 | + | ||
| 205 | 214 | return cret | |
| 206 | 215 | } | |
| 207 | 216 | ||
| @@ -215,6 +224,7 @@ var xMkdir func(string, int) int | |||
| 215 | 224 | func Mkdir(FilenameVar string, ModeVar int) int { | |
| 216 | 225 | ||
| 217 | 226 | cret := xMkdir(FilenameVar, ModeVar) | |
| 227 | + | ||
| 218 | 228 | return cret | |
| 219 | 229 | } | |
| 220 | 230 | ||
| @@ -241,6 +251,7 @@ var xOpen func(string, int, int) int | |||
| 241 | 251 | func Open(FilenameVar string, FlagsVar int, ModeVar int) int { | |
| 242 | 252 | ||
| 243 | 253 | cret := xOpen(FilenameVar, FlagsVar, ModeVar) | |
| 254 | + | ||
| 244 | 255 | return cret | |
| 245 | 256 | } | |
| 246 | 257 | ||
| @@ -265,6 +276,7 @@ var xRemove func(string) int | |||
| 265 | 276 | func Remove(FilenameVar string) int { | |
| 266 | 277 | ||
| 267 | 278 | cret := xRemove(FilenameVar) | |
| 279 | + | ||
| 268 | 280 | return cret | |
| 269 | 281 | } | |
| 270 | 282 | ||
| @@ -279,6 +291,7 @@ var xRename func(string, string) int | |||
| 279 | 291 | func Rename(OldfilenameVar string, NewfilenameVar string) int { | |
| 280 | 292 | ||
| 281 | 293 | cret := xRename(OldfilenameVar, NewfilenameVar) | |
| 294 | + | ||
| 282 | 295 | return cret | |
| 283 | 296 | } | |
| 284 | 297 | ||
| @@ -292,6 +305,7 @@ var xRmdir func(string) int | |||
| 292 | 305 | func Rmdir(FilenameVar string) int { | |
| 293 | 306 | ||
| 294 | 307 | cret := xRmdir(FilenameVar) | |
| 308 | + | ||
| 295 | 309 | return cret | |
| 296 | 310 | } | |
| 297 | 311 | ||
| @@ -320,6 +334,7 @@ var xStat func(string, *StatBuf) int | |||
| 320 | 334 | func Stat(FilenameVar string, BufVar *StatBuf) int { | |
| 321 | 335 | ||
| 322 | 336 | cret := xStat(FilenameVar, BufVar) | |
| 337 | + | ||
| 323 | 338 | return cret | |
| 324 | 339 | } | |
| 325 | 340 | ||
| @@ -336,6 +351,7 @@ var xUnlink func(string) int | |||
| 336 | 351 | func Unlink(FilenameVar string) int { | |
| 337 | 352 | ||
| 338 | 353 | cret := xUnlink(FilenameVar) | |
| 354 | + | ||
| 339 | 355 | return cret | |
| 340 | 356 | } | |
| 341 | 357 | ||
| @@ -349,6 +365,7 @@ var xUtime func(string, uintptr) int | |||
| 349 | 365 | func Utime(FilenameVar string, UtbVar uintptr) int { | |
| 350 | 366 | ||
| 351 | 367 | cret := xUtime(FilenameVar, UtbVar) | |
| 368 | + | ||
| 352 | 369 | return cret | |
| 353 | 370 | } | |
| 354 | 371 | ||
M v4/glib/gstrfuncs.go +57 -0
| @@ -74,6 +74,7 @@ var xAsciiDigitValue func(byte) int | |||
| 74 | 74 | func AsciiDigitValue(CVar byte) int { | |
| 75 | 75 | ||
| 76 | 76 | cret := xAsciiDigitValue(CVar) | |
| 77 | + | ||
| 77 | 78 | return cret | |
| 78 | 79 | } | |
| 79 | 80 | ||
| @@ -91,6 +92,7 @@ var xAsciiDtostr func(string, int, float64) string | |||
| 91 | 92 | func AsciiDtostr(BufferVar string, BufLenVar int, DVar float64) string { | |
| 92 | 93 | ||
| 93 | 94 | cret := xAsciiDtostr(BufferVar, BufLenVar, DVar) | |
| 95 | + | ||
| 94 | 96 | return cret | |
| 95 | 97 | } | |
| 96 | 98 | ||
| @@ -111,6 +113,7 @@ var xAsciiFormatd func(string, int, string, float64) string | |||
| 111 | 113 | func AsciiFormatd(BufferVar string, BufLenVar int, FormatVar string, DVar float64) string { | |
| 112 | 114 | ||
| 113 | 115 | cret := xAsciiFormatd(BufferVar, BufLenVar, FormatVar, DVar) | |
| 116 | + | ||
| 114 | 117 | return cret | |
| 115 | 118 | } | |
| 116 | 119 | ||
| @@ -134,6 +137,7 @@ var xAsciiStrcasecmp func(string, string) int | |||
| 134 | 137 | func AsciiStrcasecmp(S1Var string, S2Var string) int { | |
| 135 | 138 | ||
| 136 | 139 | cret := xAsciiStrcasecmp(S1Var, S2Var) | |
| 140 | + | ||
| 137 | 141 | return cret | |
| 138 | 142 | } | |
| 139 | 143 | ||
| @@ -144,6 +148,7 @@ var xAsciiStrdown func(string, int) string | |||
| 144 | 148 | func AsciiStrdown(StrVar string, LenVar int) string { | |
| 145 | 149 | ||
| 146 | 150 | cret := xAsciiStrdown(StrVar, LenVar) | |
| 151 | + | ||
| 147 | 152 | return cret | |
| 148 | 153 | } | |
| 149 | 154 | ||
| @@ -174,6 +179,7 @@ func AsciiStringToSigned(StrVar string, BaseVar uint, MinVar int64, MaxVar int64 | |||
| 174 | 179 | var cerr *Error | |
| 175 | 180 | ||
| 176 | 181 | cret := xAsciiStringToSigned(StrVar, BaseVar, MinVar, MaxVar, OutNumVar, &cerr) | |
| 182 | + | ||
| 177 | 183 | if cerr == nil { | |
| 178 | 184 | return cret, nil | |
| 179 | 185 | } | |
| @@ -209,6 +215,7 @@ func AsciiStringToUnsigned(StrVar string, BaseVar uint, MinVar uint64, MaxVar ui | |||
| 209 | 215 | var cerr *Error | |
| 210 | 216 | ||
| 211 | 217 | cret := xAsciiStringToUnsigned(StrVar, BaseVar, MinVar, MaxVar, OutNumVar, &cerr) | |
| 218 | + | ||
| 212 | 219 | if cerr == nil { | |
| 213 | 220 | return cret, nil | |
| 214 | 221 | } | |
| @@ -233,6 +240,7 @@ var xAsciiStrncasecmp func(string, string, uint) int | |||
| 233 | 240 | func AsciiStrncasecmp(S1Var string, S2Var string, NVar uint) int { | |
| 234 | 241 | ||
| 235 | 242 | cret := xAsciiStrncasecmp(S1Var, S2Var, NVar) | |
| 243 | + | ||
| 236 | 244 | return cret | |
| 237 | 245 | } | |
| 238 | 246 | ||
| @@ -264,6 +272,7 @@ var xAsciiStrtod func(string, *string) float64 | |||
| 264 | 272 | func AsciiStrtod(NptrVar string, EndptrVar *string) float64 { | |
| 265 | 273 | ||
| 266 | 274 | cret := xAsciiStrtod(NptrVar, EndptrVar) | |
| 275 | + | ||
| 267 | 276 | return cret | |
| 268 | 277 | } | |
| 269 | 278 | ||
| @@ -290,6 +299,7 @@ var xAsciiStrtoll func(string, *string, uint) int64 | |||
| 290 | 299 | func AsciiStrtoll(NptrVar string, EndptrVar *string, BaseVar uint) int64 { | |
| 291 | 300 | ||
| 292 | 301 | cret := xAsciiStrtoll(NptrVar, EndptrVar, BaseVar) | |
| 302 | + | ||
| 293 | 303 | return cret | |
| 294 | 304 | } | |
| 295 | 305 | ||
| @@ -321,6 +331,7 @@ var xAsciiStrtoull func(string, *string, uint) uint64 | |||
| 321 | 331 | func AsciiStrtoull(NptrVar string, EndptrVar *string, BaseVar uint) uint64 { | |
| 322 | 332 | ||
| 323 | 333 | cret := xAsciiStrtoull(NptrVar, EndptrVar, BaseVar) | |
| 334 | + | ||
| 324 | 335 | return cret | |
| 325 | 336 | } | |
| 326 | 337 | ||
| @@ -331,6 +342,7 @@ var xAsciiStrup func(string, int) string | |||
| 331 | 342 | func AsciiStrup(StrVar string, LenVar int) string { | |
| 332 | 343 | ||
| 333 | 344 | cret := xAsciiStrup(StrVar, LenVar) | |
| 345 | + | ||
| 334 | 346 | return cret | |
| 335 | 347 | } | |
| 336 | 348 | ||
| @@ -349,6 +361,7 @@ var xAsciiTolower func(byte) byte | |||
| 349 | 361 | func AsciiTolower(CVar byte) byte { | |
| 350 | 362 | ||
| 351 | 363 | cret := xAsciiTolower(CVar) | |
| 364 | + | ||
| 352 | 365 | return cret | |
| 353 | 366 | } | |
| 354 | 367 | ||
| @@ -367,6 +380,7 @@ var xAsciiToupper func(byte) byte | |||
| 367 | 380 | func AsciiToupper(CVar byte) byte { | |
| 368 | 381 | ||
| 369 | 382 | cret := xAsciiToupper(CVar) | |
| 383 | + | ||
| 370 | 384 | return cret | |
| 371 | 385 | } | |
| 372 | 386 | ||
| @@ -384,6 +398,7 @@ var xAsciiXdigitValue func(byte) int | |||
| 384 | 398 | func AsciiXdigitValue(CVar byte) int { | |
| 385 | 399 | ||
| 386 | 400 | cret := xAsciiXdigitValue(CVar) | |
| 401 | + | ||
| 387 | 402 | return cret | |
| 388 | 403 | } | |
| 389 | 404 | ||
| @@ -394,6 +409,7 @@ var xMemdup func(uintptr, uint) uintptr | |||
| 394 | 409 | func Memdup(MemVar uintptr, ByteSizeVar uint) uintptr { | |
| 395 | 410 | ||
| 396 | 411 | cret := xMemdup(MemVar, ByteSizeVar) | |
| 412 | + | ||
| 397 | 413 | return cret | |
| 398 | 414 | } | |
| 399 | 415 | ||
| @@ -407,6 +423,7 @@ var xMemdup2 func(uintptr, uint) uintptr | |||
| 407 | 423 | func Memdup2(MemVar uintptr, ByteSizeVar uint) uintptr { | |
| 408 | 424 | ||
| 409 | 425 | cret := xMemdup2(MemVar, ByteSizeVar) | |
| 426 | + | ||
| 410 | 427 | return cret | |
| 411 | 428 | } | |
| 412 | 429 | ||
| @@ -419,6 +436,7 @@ var xStpcpy func(string, string) string | |||
| 419 | 436 | func Stpcpy(DestVar string, SrcVar string) string { | |
| 420 | 437 | ||
| 421 | 438 | cret := xStpcpy(DestVar, SrcVar) | |
| 439 | + | ||
| 422 | 440 | return cret | |
| 423 | 441 | } | |
| 424 | 442 | ||
| @@ -428,6 +446,7 @@ var xStrHasPrefix func(string, string) bool | |||
| 428 | 446 | func StrHasPrefix(StrVar string, PrefixVar string) bool { | |
| 429 | 447 | ||
| 430 | 448 | cret := xStrHasPrefix(StrVar, PrefixVar) | |
| 449 | + | ||
| 431 | 450 | return cret | |
| 432 | 451 | } | |
| 433 | 452 | ||
| @@ -437,6 +456,7 @@ var xStrHasSuffix func(string, string) bool | |||
| 437 | 456 | func StrHasSuffix(StrVar string, SuffixVar string) bool { | |
| 438 | 457 | ||
| 439 | 458 | cret := xStrHasSuffix(StrVar, SuffixVar) | |
| 459 | + | ||
| 440 | 460 | return cret | |
| 441 | 461 | } | |
| 442 | 462 | ||
| @@ -447,6 +467,7 @@ var xStrIsAscii func(string) bool | |||
| 447 | 467 | func StrIsAscii(StrVar string) bool { | |
| 448 | 468 | ||
| 449 | 469 | cret := xStrIsAscii(StrVar) | |
| 470 | + | ||
| 450 | 471 | return cret | |
| 451 | 472 | } | |
| 452 | 473 | ||
| @@ -477,6 +498,7 @@ var xStrMatchString func(string, string, bool) bool | |||
| 477 | 498 | func StrMatchString(SearchTermVar string, PotentialHitVar string, AcceptAlternatesVar bool) bool { | |
| 478 | 499 | ||
| 479 | 500 | cret := xStrMatchString(SearchTermVar, PotentialHitVar, AcceptAlternatesVar) | |
| 501 | + | ||
| 480 | 502 | return cret | |
| 481 | 503 | } | |
| 482 | 504 | ||
| @@ -506,6 +528,7 @@ func StrToAscii(StrVar string, FromLocaleVar *string) string { | |||
| 506 | 528 | defer core.GFreeNullable(FromLocaleVarPtr) | |
| 507 | 529 | ||
| 508 | 530 | cret := xStrToAscii(StrVar, FromLocaleVarPtr) | |
| 531 | + | ||
| 509 | 532 | return cret | |
| 510 | 533 | } | |
| 511 | 534 | ||
| @@ -532,6 +555,7 @@ func StrTokenizeAndFold(StringVar string, TranslitLocaleVar *string, AsciiAltern | |||
| 532 | 555 | defer core.GFreeNullable(TranslitLocaleVarPtr) | |
| 533 | 556 | ||
| 534 | 557 | cret := xStrTokenizeAndFold(StringVar, TranslitLocaleVarPtr, AsciiAlternatesVar) | |
| 558 | + | ||
| 535 | 559 | return cret | |
| 536 | 560 | } | |
| 537 | 561 | ||
| @@ -555,6 +579,7 @@ var xStrcanon func(string, string, byte) string | |||
| 555 | 579 | func Strcanon(StringVar string, ValidCharsVar string, SubstitutorVar byte) string { | |
| 556 | 580 | ||
| 557 | 581 | cret := xStrcanon(StringVar, ValidCharsVar, SubstitutorVar) | |
| 582 | + | ||
| 558 | 583 | return cret | |
| 559 | 584 | } | |
| 560 | 585 | ||
| @@ -565,6 +590,7 @@ var xStrcasecmp func(string, string) int | |||
| 565 | 590 | func Strcasecmp(S1Var string, S2Var string) int { | |
| 566 | 591 | ||
| 567 | 592 | cret := xStrcasecmp(S1Var, S2Var) | |
| 593 | + | ||
| 568 | 594 | return cret | |
| 569 | 595 | } | |
| 570 | 596 | ||
| @@ -582,6 +608,7 @@ var xStrchomp func(string) string | |||
| 582 | 608 | func Strchomp(StringVar string) string { | |
| 583 | 609 | ||
| 584 | 610 | cret := xStrchomp(StringVar) | |
| 611 | + | ||
| 585 | 612 | return cret | |
| 586 | 613 | } | |
| 587 | 614 | ||
| @@ -600,6 +627,7 @@ var xStrchug func(string) string | |||
| 600 | 627 | func Strchug(StringVar string) string { | |
| 601 | 628 | ||
| 602 | 629 | cret := xStrchug(StringVar) | |
| 630 | + | ||
| 603 | 631 | return cret | |
| 604 | 632 | } | |
| 605 | 633 | ||
| @@ -622,6 +650,7 @@ var xStrcompress func(string) string | |||
| 622 | 650 | func Strcompress(SourceVar string) string { | |
| 623 | 651 | ||
| 624 | 652 | cret := xStrcompress(SourceVar) | |
| 653 | + | ||
| 625 | 654 | return cret | |
| 626 | 655 | } | |
| 627 | 656 | ||
| @@ -638,6 +667,7 @@ var xStrconcat func(string, ...interface{}) string | |||
| 638 | 667 | func Strconcat(String1Var string, varArgs ...interface{}) string { | |
| 639 | 668 | ||
| 640 | 669 | cret := xStrconcat(String1Var, varArgs...) | |
| 670 | + | ||
| 641 | 671 | return cret | |
| 642 | 672 | } | |
| 643 | 673 | ||
| @@ -666,6 +696,7 @@ func Strdelimit(StringVar string, DelimitersVar *string, NewDelimiterVar byte) s | |||
| 666 | 696 | defer core.GFreeNullable(DelimitersVarPtr) | |
| 667 | 697 | ||
| 668 | 698 | cret := xStrdelimit(StringVar, DelimitersVarPtr, NewDelimiterVar) | |
| 699 | + | ||
| 669 | 700 | return cret | |
| 670 | 701 | } | |
| 671 | 702 | ||
| @@ -675,6 +706,7 @@ var xStrdown func(string) string | |||
| 675 | 706 | func Strdown(StringVar string) string { | |
| 676 | 707 | ||
| 677 | 708 | cret := xStrdown(StringVar) | |
| 709 | + | ||
| 678 | 710 | return cret | |
| 679 | 711 | } | |
| 680 | 712 | ||
| @@ -687,6 +719,7 @@ func Strdup(StrVar *string) string { | |||
| 687 | 719 | defer core.GFreeNullable(StrVarPtr) | |
| 688 | 720 | ||
| 689 | 721 | cret := xStrdup(StrVarPtr) | |
| 722 | + | ||
| 690 | 723 | return cret | |
| 691 | 724 | } | |
| 692 | 725 | ||
| @@ -702,6 +735,7 @@ var xStrdupPrintf func(string, ...interface{}) string | |||
| 702 | 735 | func StrdupPrintf(FormatVar string, varArgs ...interface{}) string { | |
| 703 | 736 | ||
| 704 | 737 | cret := xStrdupPrintf(FormatVar, varArgs...) | |
| 738 | + | ||
| 705 | 739 | return cret | |
| 706 | 740 | } | |
| 707 | 741 | ||
| @@ -720,6 +754,7 @@ var xStrdupVprintf func(string, []interface{}) string | |||
| 720 | 754 | func StrdupVprintf(FormatVar string, ArgsVar []interface{}) string { | |
| 721 | 755 | ||
| 722 | 756 | cret := xStrdupVprintf(FormatVar, ArgsVar) | |
| 757 | + | ||
| 723 | 758 | return cret | |
| 724 | 759 | } | |
| 725 | 760 | ||
| @@ -732,6 +767,7 @@ var xStrdupv func([]string) []string | |||
| 732 | 767 | func Strdupv(StrArrayVar []string) []string { | |
| 733 | 768 | ||
| 734 | 769 | cret := xStrdupv(StrArrayVar) | |
| 770 | + | ||
| 735 | 771 | return cret | |
| 736 | 772 | } | |
| 737 | 773 | ||
| @@ -761,6 +797,7 @@ var xStrerror func(int) string | |||
| 761 | 797 | func Strerror(ErrnumVar int) string { | |
| 762 | 798 | ||
| 763 | 799 | cret := xStrerror(ErrnumVar) | |
| 800 | + | ||
| 764 | 801 | return cret | |
| 765 | 802 | } | |
| 766 | 803 | ||
| @@ -791,6 +828,7 @@ func Strescape(SourceVar string, ExceptionsVar *string) string { | |||
| 791 | 828 | defer core.GFreeNullable(ExceptionsVarPtr) | |
| 792 | 829 | ||
| 793 | 830 | cret := xStrescape(SourceVar, ExceptionsVarPtr) | |
| 831 | + | ||
| 794 | 832 | return cret | |
| 795 | 833 | } | |
| 796 | 834 | ||
| @@ -815,6 +853,7 @@ func Strjoin(SeparatorVar *string, varArgs ...interface{}) string { | |||
| 815 | 853 | defer core.GFreeNullable(SeparatorVarPtr) | |
| 816 | 854 | ||
| 817 | 855 | cret := xStrjoin(SeparatorVarPtr, varArgs...) | |
| 856 | + | ||
| 818 | 857 | return cret | |
| 819 | 858 | } | |
| 820 | 859 | ||
| @@ -832,6 +871,7 @@ func Strjoinv(SeparatorVar *string, StrArrayVar []string) string { | |||
| 832 | 871 | defer core.GFreeNullable(SeparatorVarPtr) | |
| 833 | 872 | ||
| 834 | 873 | cret := xStrjoinv(SeparatorVarPtr, StrArrayVar) | |
| 874 | + | ||
| 835 | 875 | return cret | |
| 836 | 876 | } | |
| 837 | 877 | ||
| @@ -853,6 +893,7 @@ var xStrlcat func(string, string, uint) uint | |||
| 853 | 893 | func Strlcat(DestVar string, SrcVar string, DestSizeVar uint) uint { | |
| 854 | 894 | ||
| 855 | 895 | cret := xStrlcat(DestVar, SrcVar, DestSizeVar) | |
| 896 | + | ||
| 856 | 897 | return cret | |
| 857 | 898 | } | |
| 858 | 899 | ||
| @@ -875,6 +916,7 @@ var xStrlcpy func(string, string, uint) uint | |||
| 875 | 916 | func Strlcpy(DestVar string, SrcVar string, DestSizeVar uint) uint { | |
| 876 | 917 | ||
| 877 | 918 | cret := xStrlcpy(DestVar, SrcVar, DestSizeVar) | |
| 919 | + | ||
| 878 | 920 | return cret | |
| 879 | 921 | } | |
| 880 | 922 | ||
| @@ -887,6 +929,7 @@ var xStrncasecmp func(string, string, uint) int | |||
| 887 | 929 | func Strncasecmp(S1Var string, S2Var string, NVar uint) int { | |
| 888 | 930 | ||
| 889 | 931 | cret := xStrncasecmp(S1Var, S2Var, NVar) | |
| 932 | + | ||
| 890 | 933 | return cret | |
| 891 | 934 | } | |
| 892 | 935 | ||
| @@ -905,6 +948,7 @@ func Strndup(StrVar *string, NVar uint) string { | |||
| 905 | 948 | defer core.GFreeNullable(StrVarPtr) | |
| 906 | 949 | ||
| 907 | 950 | cret := xStrndup(StrVarPtr, NVar) | |
| 951 | + | ||
| 908 | 952 | return cret | |
| 909 | 953 | } | |
| 910 | 954 | ||
| @@ -914,6 +958,7 @@ var xStrnfill func(uint, byte) string | |||
| 914 | 958 | func Strnfill(LengthVar uint, FillCharVar byte) string { | |
| 915 | 959 | ||
| 916 | 960 | cret := xStrnfill(LengthVar, FillCharVar) | |
| 961 | + | ||
| 917 | 962 | return cret | |
| 918 | 963 | } | |
| 919 | 964 | ||
| @@ -928,6 +973,7 @@ var xStrreverse func(string) string | |||
| 928 | 973 | func Strreverse(StringVar string) string { | |
| 929 | 974 | ||
| 930 | 975 | cret := xStrreverse(StringVar) | |
| 976 | + | ||
| 931 | 977 | return cret | |
| 932 | 978 | } | |
| 933 | 979 | ||
| @@ -941,6 +987,7 @@ var xStrrstr func(string, string) string | |||
| 941 | 987 | func Strrstr(HaystackVar string, NeedleVar string) string { | |
| 942 | 988 | ||
| 943 | 989 | cret := xStrrstr(HaystackVar, NeedleVar) | |
| 990 | + | ||
| 944 | 991 | return cret | |
| 945 | 992 | } | |
| 946 | 993 | ||
| @@ -955,6 +1002,7 @@ var xStrrstrLen func(string, int, string) string | |||
| 955 | 1002 | func StrrstrLen(HaystackVar string, HaystackLenVar int, NeedleVar string) string { | |
| 956 | 1003 | ||
| 957 | 1004 | cret := xStrrstrLen(HaystackVar, HaystackLenVar, NeedleVar) | |
| 1005 | + | ||
| 958 | 1006 | return cret | |
| 959 | 1007 | } | |
| 960 | 1008 | ||
| @@ -969,6 +1017,7 @@ var xStrsignal func(int) string | |||
| 969 | 1017 | func Strsignal(SignumVar int) string { | |
| 970 | 1018 | ||
| 971 | 1019 | cret := xStrsignal(SignumVar) | |
| 1020 | + | ||
| 972 | 1021 | return cret | |
| 973 | 1022 | } | |
| 974 | 1023 | ||
| @@ -990,6 +1039,7 @@ var xStrsplit func(string, string, int) []string | |||
| 990 | 1039 | func Strsplit(StringVar string, DelimiterVar string, MaxTokensVar int) []string { | |
| 991 | 1040 | ||
| 992 | 1041 | cret := xStrsplit(StringVar, DelimiterVar, MaxTokensVar) | |
| 1042 | + | ||
| 993 | 1043 | return cret | |
| 994 | 1044 | } | |
| 995 | 1045 | ||
| @@ -1018,6 +1068,7 @@ var xStrsplitSet func(string, string, int) []string | |||
| 1018 | 1068 | func StrsplitSet(StringVar string, DelimitersVar string, MaxTokensVar int) []string { | |
| 1019 | 1069 | ||
| 1020 | 1070 | cret := xStrsplitSet(StringVar, DelimitersVar, MaxTokensVar) | |
| 1071 | + | ||
| 1021 | 1072 | return cret | |
| 1022 | 1073 | } | |
| 1023 | 1074 | ||
| @@ -1035,6 +1086,7 @@ var xStrstrLen func(string, int, string) string | |||
| 1035 | 1086 | func StrstrLen(HaystackVar string, HaystackLenVar int, NeedleVar string) string { | |
| 1036 | 1087 | ||
| 1037 | 1088 | cret := xStrstrLen(HaystackVar, HaystackLenVar, NeedleVar) | |
| 1089 | + | ||
| 1038 | 1090 | return cret | |
| 1039 | 1091 | } | |
| 1040 | 1092 | ||
| @@ -1055,6 +1107,7 @@ var xStrtod func(string, *string) float64 | |||
| 1055 | 1107 | func Strtod(NptrVar string, EndptrVar *string) float64 { | |
| 1056 | 1108 | ||
| 1057 | 1109 | cret := xStrtod(NptrVar, EndptrVar) | |
| 1110 | + | ||
| 1058 | 1111 | return cret | |
| 1059 | 1112 | } | |
| 1060 | 1113 | ||
| @@ -1064,6 +1117,7 @@ var xStrup func(string) string | |||
| 1064 | 1117 | func Strup(StringVar string) string { | |
| 1065 | 1118 | ||
| 1066 | 1119 | cret := xStrup(StringVar) | |
| 1120 | + | ||
| 1067 | 1121 | return cret | |
| 1068 | 1122 | } | |
| 1069 | 1123 | ||
| @@ -1074,6 +1128,7 @@ var xStrvContains func([]string, string) bool | |||
| 1074 | 1128 | func StrvContains(StrvVar []string, StrVar string) bool { | |
| 1075 | 1129 | ||
| 1076 | 1130 | cret := xStrvContains(StrvVar, StrVar) | |
| 1131 | + | ||
| 1077 | 1132 | return cret | |
| 1078 | 1133 | } | |
| 1079 | 1134 | ||
| @@ -1091,6 +1146,7 @@ var xStrvEqual func([]string, []string) bool | |||
| 1091 | 1146 | func StrvEqual(Strv1Var []string, Strv2Var []string) bool { | |
| 1092 | 1147 | ||
| 1093 | 1148 | cret := xStrvEqual(Strv1Var, Strv2Var) | |
| 1149 | + | ||
| 1094 | 1150 | return cret | |
| 1095 | 1151 | } | |
| 1096 | 1152 | ||
| @@ -1100,6 +1156,7 @@ var xStrvLength func([]string) uint | |||
| 1100 | 1156 | func StrvLength(StrArrayVar []string) uint { | |
| 1101 | 1157 | ||
| 1102 | 1158 | cret := xStrvLength(StrArrayVar) | |
| 1159 | + | ||
| 1103 | 1160 | return cret | |
| 1104 | 1161 | } | |
| 1105 | 1162 | ||
M v4/glib/gtestutils.go +22 -0
| @@ -410,6 +410,7 @@ func Strcmp0(Str1Var *string, Str2Var *string) int { | |||
| 410 | 410 | defer core.GFreeNullable(Str2VarPtr) | |
| 411 | 411 | ||
| 412 | 412 | cret := xStrcmp0(Str1VarPtr, Str2VarPtr) | |
| 413 | + | ||
| 413 | 414 | return cret | |
| 414 | 415 | } | |
| 415 | 416 | ||
| @@ -659,6 +660,7 @@ var xTestBuildFilename func(TestFileType, string, ...interface{}) string | |||
| 659 | 660 | func TestBuildFilename(FileTypeVar TestFileType, FirstPathVar string, varArgs ...interface{}) string { | |
| 660 | 661 | ||
| 661 | 662 | cret := xTestBuildFilename(FileTypeVar, FirstPathVar, varArgs...) | |
| 663 | + | ||
| 662 | 664 | return cret | |
| 663 | 665 | } | |
| 664 | 666 | ||
| @@ -729,6 +731,7 @@ func TestCreateCase(TestNameVar string, DataSizeVar uint, TestDataVar uintptr, D | |||
| 729 | 731 | } | |
| 730 | 732 | ||
| 731 | 733 | cret := xTestCreateCase(TestNameVar, DataSizeVar, TestDataVar, DataSetupVarRef, DataTestVarRef, DataTeardownVarRef) | |
| 734 | + | ||
| 732 | 735 | return cret | |
| 733 | 736 | } | |
| 734 | 737 | ||
| @@ -738,6 +741,7 @@ var xTestCreateSuite func(string) *TestSuite | |||
| 738 | 741 | func TestCreateSuite(SuiteNameVar string) *TestSuite { | |
| 739 | 742 | ||
| 740 | 743 | cret := xTestCreateSuite(SuiteNameVar) | |
| 744 | + | ||
| 741 | 745 | return cret | |
| 742 | 746 | } | |
| 743 | 747 | ||
| @@ -859,6 +863,7 @@ var xTestFailed func() bool | |||
| 859 | 863 | func TestFailed() bool { | |
| 860 | 864 | ||
| 861 | 865 | cret := xTestFailed() | |
| 866 | + | ||
| 862 | 867 | return cret | |
| 863 | 868 | } | |
| 864 | 869 | ||
| @@ -872,6 +877,7 @@ var xTestGetDir func(TestFileType) string | |||
| 872 | 877 | func TestGetDir(FileTypeVar TestFileType) string { | |
| 873 | 878 | ||
| 874 | 879 | cret := xTestGetDir(FileTypeVar) | |
| 880 | + | ||
| 875 | 881 | return cret | |
| 876 | 882 | } | |
| 877 | 883 | ||
| @@ -892,6 +898,7 @@ var xTestGetFilename func(TestFileType, string, ...interface{}) string | |||
| 892 | 898 | func TestGetFilename(FileTypeVar TestFileType, FirstPathVar string, varArgs ...interface{}) string { | |
| 893 | 899 | ||
| 894 | 900 | cret := xTestGetFilename(FileTypeVar, FirstPathVar, varArgs...) | |
| 901 | + | ||
| 895 | 902 | return cret | |
| 896 | 903 | } | |
| 897 | 904 | ||
| @@ -908,6 +915,7 @@ var xTestGetPath func() string | |||
| 908 | 915 | func TestGetPath() string { | |
| 909 | 916 | ||
| 910 | 917 | cret := xTestGetPath() | |
| 918 | + | ||
| 911 | 919 | return cret | |
| 912 | 920 | } | |
| 913 | 921 | ||
| @@ -917,6 +925,7 @@ var xTestGetRoot func() *TestSuite | |||
| 917 | 925 | func TestGetRoot() *TestSuite { | |
| 918 | 926 | ||
| 919 | 927 | cret := xTestGetRoot() | |
| 928 | + | ||
| 920 | 929 | return cret | |
| 921 | 930 | } | |
| 922 | 931 | ||
| @@ -1071,6 +1080,7 @@ var xTestLogTypeName func(TestLogType) string | |||
| 1071 | 1080 | func TestLogTypeName(LogTypeVar TestLogType) string { | |
| 1072 | 1081 | ||
| 1073 | 1082 | cret := xTestLogTypeName(LogTypeVar) | |
| 1083 | + | ||
| 1074 | 1084 | return cret | |
| 1075 | 1085 | } | |
| 1076 | 1086 | ||
| @@ -1162,6 +1172,7 @@ var xTestRandDouble func() float64 | |||
| 1162 | 1172 | func TestRandDouble() float64 { | |
| 1163 | 1173 | ||
| 1164 | 1174 | cret := xTestRandDouble() | |
| 1175 | + | ||
| 1165 | 1176 | return cret | |
| 1166 | 1177 | } | |
| 1167 | 1178 | ||
| @@ -1173,6 +1184,7 @@ var xTestRandDoubleRange func(float64, float64) float64 | |||
| 1173 | 1184 | func TestRandDoubleRange(RangeStartVar float64, RangeEndVar float64) float64 { | |
| 1174 | 1185 | ||
| 1175 | 1186 | cret := xTestRandDoubleRange(RangeStartVar, RangeEndVar) | |
| 1187 | + | ||
| 1176 | 1188 | return cret | |
| 1177 | 1189 | } | |
| 1178 | 1190 | ||
| @@ -1190,6 +1202,7 @@ var xTestRandInt func() int32 | |||
| 1190 | 1202 | func TestRandInt() int32 { | |
| 1191 | 1203 | ||
| 1192 | 1204 | cret := xTestRandInt() | |
| 1205 | + | ||
| 1193 | 1206 | return cret | |
| 1194 | 1207 | } | |
| 1195 | 1208 | ||
| @@ -1201,6 +1214,7 @@ var xTestRandIntRange func(int32, int32) int32 | |||
| 1201 | 1214 | func TestRandIntRange(BeginVar int32, EndVar int32) int32 { | |
| 1202 | 1215 | ||
| 1203 | 1216 | cret := xTestRandIntRange(BeginVar, EndVar) | |
| 1217 | + | ||
| 1204 | 1218 | return cret | |
| 1205 | 1219 | } | |
| 1206 | 1220 | ||
| @@ -1243,6 +1257,7 @@ var xTestRun func() int | |||
| 1243 | 1257 | func TestRun() int { | |
| 1244 | 1258 | ||
| 1245 | 1259 | cret := xTestRun() | |
| 1260 | + | ||
| 1246 | 1261 | return cret | |
| 1247 | 1262 | } | |
| 1248 | 1263 | ||
| @@ -1260,6 +1275,7 @@ var xTestRunSuite func(*TestSuite) int | |||
| 1260 | 1275 | func TestRunSuite(SuiteVar *TestSuite) int { | |
| 1261 | 1276 | ||
| 1262 | 1277 | cret := xTestRunSuite(SuiteVar) | |
| 1278 | + | ||
| 1263 | 1279 | return cret | |
| 1264 | 1280 | } | |
| 1265 | 1281 | ||
| @@ -1323,6 +1339,7 @@ var xTestSubprocess func() bool | |||
| 1323 | 1339 | func TestSubprocess() bool { | |
| 1324 | 1340 | ||
| 1325 | 1341 | cret := xTestSubprocess() | |
| 1342 | + | ||
| 1326 | 1343 | return cret | |
| 1327 | 1344 | } | |
| 1328 | 1345 | ||
| @@ -1365,6 +1382,7 @@ var xTestTimerElapsed func() float64 | |||
| 1365 | 1382 | func TestTimerElapsed() float64 { | |
| 1366 | 1383 | ||
| 1367 | 1384 | cret := xTestTimerElapsed() | |
| 1385 | + | ||
| 1368 | 1386 | return cret | |
| 1369 | 1387 | } | |
| 1370 | 1388 | ||
| @@ -1374,6 +1392,7 @@ var xTestTimerLast func() float64 | |||
| 1374 | 1392 | func TestTimerLast() float64 { | |
| 1375 | 1393 | ||
| 1376 | 1394 | cret := xTestTimerLast() | |
| 1395 | + | ||
| 1377 | 1396 | return cret | |
| 1378 | 1397 | } | |
| 1379 | 1398 | ||
| @@ -1439,6 +1458,7 @@ var xTestTrapFork func(uint64, TestTrapFlags) bool | |||
| 1439 | 1458 | func TestTrapFork(UsecTimeoutVar uint64, TestTrapFlagsVar TestTrapFlags) bool { | |
| 1440 | 1459 | ||
| 1441 | 1460 | cret := xTestTrapFork(UsecTimeoutVar, TestTrapFlagsVar) | |
| 1461 | + | ||
| 1442 | 1462 | return cret | |
| 1443 | 1463 | } | |
| 1444 | 1464 | ||
| @@ -1448,6 +1468,7 @@ var xTestTrapHasPassed func() bool | |||
| 1448 | 1468 | func TestTrapHasPassed() bool { | |
| 1449 | 1469 | ||
| 1450 | 1470 | cret := xTestTrapHasPassed() | |
| 1471 | + | ||
| 1451 | 1472 | return cret | |
| 1452 | 1473 | } | |
| 1453 | 1474 | ||
| @@ -1457,6 +1478,7 @@ var xTestTrapReachedTimeout func() bool | |||
| 1457 | 1478 | func TestTrapReachedTimeout() bool { | |
| 1458 | 1479 | ||
| 1459 | 1480 | cret := xTestTrapReachedTimeout() | |
| 1481 | + | ||
| 1460 | 1482 | return cret | |
| 1461 | 1483 | } | |
| 1462 | 1484 | ||
M v4/glib/gthread.go +11 -0
| @@ -2097,6 +2097,7 @@ var xCondNew func() *Cond | |||
| 2097 | 2097 | func CondNew() *Cond { | |
| 2098 | 2098 | ||
| 2099 | 2099 | cret := xCondNew() | |
| 2100 | + | ||
| 2100 | 2101 | return cret | |
| 2101 | 2102 | } | |
| 2102 | 2103 | ||
| @@ -2109,6 +2110,7 @@ var xGetNumProcessors func() uint | |||
| 2109 | 2110 | func GetNumProcessors() uint { | |
| 2110 | 2111 | ||
| 2111 | 2112 | cret := xGetNumProcessors() | |
| 2113 | + | ||
| 2112 | 2114 | return cret | |
| 2113 | 2115 | } | |
| 2114 | 2116 | ||
| @@ -2118,6 +2120,7 @@ var xMutexNew func() *Mutex | |||
| 2118 | 2120 | func MutexNew() *Mutex { | |
| 2119 | 2121 | ||
| 2120 | 2122 | cret := xMutexNew() | |
| 2123 | + | ||
| 2121 | 2124 | return cret | |
| 2122 | 2125 | } | |
| 2123 | 2126 | ||
| @@ -2153,6 +2156,7 @@ var xOnceInitEnter func(uintptr) bool | |||
| 2153 | 2156 | func OnceInitEnter(LocationVar uintptr) bool { | |
| 2154 | 2157 | ||
| 2155 | 2158 | cret := xOnceInitEnter(LocationVar) | |
| 2159 | + | ||
| 2156 | 2160 | return cret | |
| 2157 | 2161 | } | |
| 2158 | 2162 | ||
| @@ -2161,6 +2165,7 @@ var xOnceInitEnterImpl func(uint) bool | |||
| 2161 | 2165 | func OnceInitEnterImpl(LocationVar uint) bool { | |
| 2162 | 2166 | ||
| 2163 | 2167 | cret := xOnceInitEnterImpl(LocationVar) | |
| 2168 | + | ||
| 2164 | 2169 | return cret | |
| 2165 | 2170 | } | |
| 2166 | 2171 | ||
| @@ -2186,6 +2191,7 @@ var xOnceInitEnterPointer func(uintptr) bool | |||
| 2186 | 2191 | func OnceInitEnterPointer(LocationVar uintptr) bool { | |
| 2187 | 2192 | ||
| 2188 | 2193 | cret := xOnceInitEnterPointer(LocationVar) | |
| 2194 | + | ||
| 2189 | 2195 | return cret | |
| 2190 | 2196 | } | |
| 2191 | 2197 | ||
| @@ -2242,6 +2248,7 @@ func PrivateNew(NotifyVar *DestroyNotify) *Private { | |||
| 2242 | 2248 | } | |
| 2243 | 2249 | ||
| 2244 | 2250 | cret := xPrivateNew(NotifyVarRef) | |
| 2251 | + | ||
| 2245 | 2252 | return cret | |
| 2246 | 2253 | } | |
| 2247 | 2254 | ||
| @@ -2278,6 +2285,7 @@ func ThreadCreate(FuncVar *ThreadFunc, DataVar uintptr, JoinableVar bool) (*Thre | |||
| 2278 | 2285 | } | |
| 2279 | 2286 | ||
| 2280 | 2287 | cret := xThreadCreate(FuncVarRef, DataVar, JoinableVar, &cerr) | |
| 2288 | + | ||
| 2281 | 2289 | if cerr == nil { | |
| 2282 | 2290 | return cret, nil | |
| 2283 | 2291 | } | |
| @@ -2307,6 +2315,7 @@ func ThreadCreateFull(FuncVar *ThreadFunc, DataVar uintptr, StackSizeVar uint, J | |||
| 2307 | 2315 | } | |
| 2308 | 2316 | ||
| 2309 | 2317 | cret := xThreadCreateFull(FuncVarRef, DataVar, StackSizeVar, JoinableVar, BoundVar, PriorityVar, &cerr) | |
| 2318 | + | ||
| 2310 | 2319 | if cerr == nil { | |
| 2311 | 2320 | return cret, nil | |
| 2312 | 2321 | } | |
| @@ -2375,6 +2384,7 @@ var xThreadGetInitialized func() bool | |||
| 2375 | 2384 | func ThreadGetInitialized() bool { | |
| 2376 | 2385 | ||
| 2377 | 2386 | cret := xThreadGetInitialized() | |
| 2387 | + | ||
| 2378 | 2388 | return cret | |
| 2379 | 2389 | } | |
| 2380 | 2390 | ||
| @@ -2430,6 +2440,7 @@ var xThreadSelf func() *Thread | |||
| 2430 | 2440 | func ThreadSelf() *Thread { | |
| 2431 | 2441 | ||
| 2432 | 2442 | cret := xThreadSelf() | |
| 2443 | + | ||
| 2433 | 2444 | return cret | |
| 2434 | 2445 | } | |
| 2435 | 2446 | ||
M v4/glib/gthreadpool.go +3 -0
| @@ -211,6 +211,7 @@ var xThreadPoolGetMaxIdleTime func() uint | |||
| 211 | 211 | func ThreadPoolGetMaxIdleTime() uint { | |
| 212 | 212 | ||
| 213 | 213 | cret := xThreadPoolGetMaxIdleTime() | |
| 214 | + | ||
| 214 | 215 | return cret | |
| 215 | 216 | } | |
| 216 | 217 | ||
| @@ -220,6 +221,7 @@ var xThreadPoolGetMaxUnusedThreads func() int | |||
| 220 | 221 | func ThreadPoolGetMaxUnusedThreads() int { | |
| 221 | 222 | ||
| 222 | 223 | cret := xThreadPoolGetMaxUnusedThreads() | |
| 224 | + | ||
| 223 | 225 | return cret | |
| 224 | 226 | } | |
| 225 | 227 | ||
| @@ -229,6 +231,7 @@ var xThreadPoolGetNumUnusedThreads func() uint | |||
| 229 | 231 | func ThreadPoolGetNumUnusedThreads() uint { | |
| 230 | 232 | ||
| 231 | 233 | cret := xThreadPoolGetNumUnusedThreads() | |
| 234 | + | ||
| 232 | 235 | return cret | |
| 233 | 236 | } | |
| 234 | 237 | ||
M v4/glib/gtimer.go +1 -0
| @@ -126,6 +126,7 @@ var xTimeValFromIso8601 func(string, *TimeVal) bool | |||
| 126 | 126 | func TimeValFromIso8601(IsoDateVar string, TimeVar *TimeVal) bool { | |
| 127 | 127 | ||
| 128 | 128 | cret := xTimeValFromIso8601(IsoDateVar, TimeVar) | |
| 129 | + | ||
| 129 | 130 | return cret | |
| 130 | 131 | } | |
| 131 | 132 | ||
M v4/glib/gtrashstack.go +3 -0
| @@ -41,6 +41,7 @@ var xTrashStackHeight func(**TrashStack) uint | |||
| 41 | 41 | func TrashStackHeight(StackPVar **TrashStack) uint { | |
| 42 | 42 | ||
| 43 | 43 | cret := xTrashStackHeight(StackPVar) | |
| 44 | + | ||
| 44 | 45 | return cret | |
| 45 | 46 | } | |
| 46 | 47 | ||
| @@ -51,6 +52,7 @@ var xTrashStackPeek func(**TrashStack) uintptr | |||
| 51 | 52 | func TrashStackPeek(StackPVar **TrashStack) uintptr { | |
| 52 | 53 | ||
| 53 | 54 | cret := xTrashStackPeek(StackPVar) | |
| 55 | + | ||
| 54 | 56 | return cret | |
| 55 | 57 | } | |
| 56 | 58 | ||
| @@ -60,6 +62,7 @@ var xTrashStackPop func(**TrashStack) uintptr | |||
| 60 | 62 | func TrashStackPop(StackPVar **TrashStack) uintptr { | |
| 61 | 63 | ||
| 62 | 64 | cret := xTrashStackPop(StackPVar) | |
| 65 | + | ||
| 63 | 66 | return cret | |
| 64 | 67 | } | |
| 65 | 68 | ||
M v4/glib/gunicode.go +66 -0
| @@ -622,6 +622,7 @@ func Ucs4ToUtf16(StrVar []uint32, LenVar int, ItemsReadVar *int, ItemsWrittenVar | |||
| 622 | 622 | var cerr *Error | |
| 623 | 623 | ||
| 624 | 624 | cret := xUcs4ToUtf16(StrVar, LenVar, ItemsReadVar, ItemsWrittenVar, &cerr) | |
| 625 | + | ||
| 625 | 626 | if cerr == nil { | |
| 626 | 627 | return cret, nil | |
| 627 | 628 | } | |
| @@ -639,6 +640,7 @@ func Ucs4ToUtf8(StrVar []uint32, LenVar int, ItemsReadVar *int, ItemsWrittenVar | |||
| 639 | 640 | var cerr *Error | |
| 640 | 641 | ||
| 641 | 642 | cret := xUcs4ToUtf8(StrVar, LenVar, ItemsReadVar, ItemsWrittenVar, &cerr) | |
| 643 | + | ||
| 642 | 644 | if cerr == nil { | |
| 643 | 645 | return cret, nil | |
| 644 | 646 | } | |
| @@ -657,6 +659,7 @@ var xUnicharBreakType func(uint32) UnicodeBreakType | |||
| 657 | 659 | func UnicharBreakType(CVar uint32) UnicodeBreakType { | |
| 658 | 660 | ||
| 659 | 661 | cret := xUnicharBreakType(CVar) | |
| 662 | + | ||
| 660 | 663 | return cret | |
| 661 | 664 | } | |
| 662 | 665 | ||
| @@ -666,6 +669,7 @@ var xUnicharCombiningClass func(uint32) int | |||
| 666 | 669 | func UnicharCombiningClass(UcVar uint32) int { | |
| 667 | 670 | ||
| 668 | 671 | cret := xUnicharCombiningClass(UcVar) | |
| 672 | + | ||
| 669 | 673 | return cret | |
| 670 | 674 | } | |
| 671 | 675 | ||
| @@ -690,6 +694,7 @@ var xUnicharCompose func(uint32, uint32, *uint32) bool | |||
| 690 | 694 | func UnicharCompose(AVar uint32, BVar uint32, ChVar *uint32) bool { | |
| 691 | 695 | ||
| 692 | 696 | cret := xUnicharCompose(AVar, BVar, ChVar) | |
| 697 | + | ||
| 693 | 698 | return cret | |
| 694 | 699 | } | |
| 695 | 700 | ||
| @@ -721,6 +726,7 @@ var xUnicharDecompose func(uint32, *uint32, *uint32) bool | |||
| 721 | 726 | func UnicharDecompose(ChVar uint32, AVar *uint32, BVar *uint32) bool { | |
| 722 | 727 | ||
| 723 | 728 | cret := xUnicharDecompose(ChVar, AVar, BVar) | |
| 729 | + | ||
| 724 | 730 | return cret | |
| 725 | 731 | } | |
| 726 | 732 | ||
| @@ -731,6 +737,7 @@ var xUnicharDigitValue func(uint32) int | |||
| 731 | 737 | func UnicharDigitValue(CVar uint32) int { | |
| 732 | 738 | ||
| 733 | 739 | cret := xUnicharDigitValue(CVar) | |
| 740 | + | ||
| 734 | 741 | return cret | |
| 735 | 742 | } | |
| 736 | 743 | ||
| @@ -758,6 +765,7 @@ var xUnicharFullyDecompose func(uint32, bool, *uint32, uint) uint | |||
| 758 | 765 | func UnicharFullyDecompose(ChVar uint32, CompatVar bool, ResultVar *uint32, ResultLenVar uint) uint { | |
| 759 | 766 | ||
| 760 | 767 | cret := xUnicharFullyDecompose(ChVar, CompatVar, ResultVar, ResultLenVar) | |
| 768 | + | ||
| 761 | 769 | return cret | |
| 762 | 770 | } | |
| 763 | 771 | ||
| @@ -775,6 +783,7 @@ var xUnicharGetMirrorChar func(uint32, *uint32) bool | |||
| 775 | 783 | func UnicharGetMirrorChar(ChVar uint32, MirroredChVar *uint32) bool { | |
| 776 | 784 | ||
| 777 | 785 | cret := xUnicharGetMirrorChar(ChVar, MirroredChVar) | |
| 786 | + | ||
| 778 | 787 | return cret | |
| 779 | 788 | } | |
| 780 | 789 | ||
| @@ -790,6 +799,7 @@ var xUnicharGetScript func(uint32) UnicodeScript | |||
| 790 | 799 | func UnicharGetScript(ChVar uint32) UnicodeScript { | |
| 791 | 800 | ||
| 792 | 801 | cret := xUnicharGetScript(ChVar) | |
| 802 | + | ||
| 793 | 803 | return cret | |
| 794 | 804 | } | |
| 795 | 805 | ||
| @@ -801,6 +811,7 @@ var xUnicharIsalnum func(uint32) bool | |||
| 801 | 811 | func UnicharIsalnum(CVar uint32) bool { | |
| 802 | 812 | ||
| 803 | 813 | cret := xUnicharIsalnum(CVar) | |
| 814 | + | ||
| 804 | 815 | return cret | |
| 805 | 816 | } | |
| 806 | 817 | ||
| @@ -812,6 +823,7 @@ var xUnicharIsalpha func(uint32) bool | |||
| 812 | 823 | func UnicharIsalpha(CVar uint32) bool { | |
| 813 | 824 | ||
| 814 | 825 | cret := xUnicharIsalpha(CVar) | |
| 826 | + | ||
| 815 | 827 | return cret | |
| 816 | 828 | } | |
| 817 | 829 | ||
| @@ -823,6 +835,7 @@ var xUnicharIscntrl func(uint32) bool | |||
| 823 | 835 | func UnicharIscntrl(CVar uint32) bool { | |
| 824 | 836 | ||
| 825 | 837 | cret := xUnicharIscntrl(CVar) | |
| 838 | + | ||
| 826 | 839 | return cret | |
| 827 | 840 | } | |
| 828 | 841 | ||
| @@ -833,6 +846,7 @@ var xUnicharIsdefined func(uint32) bool | |||
| 833 | 846 | func UnicharIsdefined(CVar uint32) bool { | |
| 834 | 847 | ||
| 835 | 848 | cret := xUnicharIsdefined(CVar) | |
| 849 | + | ||
| 836 | 850 | return cret | |
| 837 | 851 | } | |
| 838 | 852 | ||
| @@ -844,6 +858,7 @@ var xUnicharIsdigit func(uint32) bool | |||
| 844 | 858 | func UnicharIsdigit(CVar uint32) bool { | |
| 845 | 859 | ||
| 846 | 860 | cret := xUnicharIsdigit(CVar) | |
| 861 | + | ||
| 847 | 862 | return cret | |
| 848 | 863 | } | |
| 849 | 864 | ||
| @@ -857,6 +872,7 @@ var xUnicharIsgraph func(uint32) bool | |||
| 857 | 872 | func UnicharIsgraph(CVar uint32) bool { | |
| 858 | 873 | ||
| 859 | 874 | cret := xUnicharIsgraph(CVar) | |
| 875 | + | ||
| 860 | 876 | return cret | |
| 861 | 877 | } | |
| 862 | 878 | ||
| @@ -868,6 +884,7 @@ var xUnicharIslower func(uint32) bool | |||
| 868 | 884 | func UnicharIslower(CVar uint32) bool { | |
| 869 | 885 | ||
| 870 | 886 | cret := xUnicharIslower(CVar) | |
| 887 | + | ||
| 871 | 888 | return cret | |
| 872 | 889 | } | |
| 873 | 890 | ||
| @@ -885,6 +902,7 @@ var xUnicharIsmark func(uint32) bool | |||
| 885 | 902 | func UnicharIsmark(CVar uint32) bool { | |
| 886 | 903 | ||
| 887 | 904 | cret := xUnicharIsmark(CVar) | |
| 905 | + | ||
| 888 | 906 | return cret | |
| 889 | 907 | } | |
| 890 | 908 | ||
| @@ -897,6 +915,7 @@ var xUnicharIsprint func(uint32) bool | |||
| 897 | 915 | func UnicharIsprint(CVar uint32) bool { | |
| 898 | 916 | ||
| 899 | 917 | cret := xUnicharIsprint(CVar) | |
| 918 | + | ||
| 900 | 919 | return cret | |
| 901 | 920 | } | |
| 902 | 921 | ||
| @@ -908,6 +927,7 @@ var xUnicharIspunct func(uint32) bool | |||
| 908 | 927 | func UnicharIspunct(CVar uint32) bool { | |
| 909 | 928 | ||
| 910 | 929 | cret := xUnicharIspunct(CVar) | |
| 930 | + | ||
| 911 | 931 | return cret | |
| 912 | 932 | } | |
| 913 | 933 | ||
| @@ -923,6 +943,7 @@ var xUnicharIsspace func(uint32) bool | |||
| 923 | 943 | func UnicharIsspace(CVar uint32) bool { | |
| 924 | 944 | ||
| 925 | 945 | cret := xUnicharIsspace(CVar) | |
| 946 | + | ||
| 926 | 947 | return cret | |
| 927 | 948 | } | |
| 928 | 949 | ||
| @@ -937,6 +958,7 @@ var xUnicharIstitle func(uint32) bool | |||
| 937 | 958 | func UnicharIstitle(CVar uint32) bool { | |
| 938 | 959 | ||
| 939 | 960 | cret := xUnicharIstitle(CVar) | |
| 961 | + | ||
| 940 | 962 | return cret | |
| 941 | 963 | } | |
| 942 | 964 | ||
| @@ -946,6 +968,7 @@ var xUnicharIsupper func(uint32) bool | |||
| 946 | 968 | func UnicharIsupper(CVar uint32) bool { | |
| 947 | 969 | ||
| 948 | 970 | cret := xUnicharIsupper(CVar) | |
| 971 | + | ||
| 949 | 972 | return cret | |
| 950 | 973 | } | |
| 951 | 974 | ||
| @@ -956,6 +979,7 @@ var xUnicharIswide func(uint32) bool | |||
| 956 | 979 | func UnicharIswide(CVar uint32) bool { | |
| 957 | 980 | ||
| 958 | 981 | cret := xUnicharIswide(CVar) | |
| 982 | + | ||
| 959 | 983 | return cret | |
| 960 | 984 | } | |
| 961 | 985 | ||
| @@ -974,6 +998,7 @@ var xUnicharIswideCjk func(uint32) bool | |||
| 974 | 998 | func UnicharIswideCjk(CVar uint32) bool { | |
| 975 | 999 | ||
| 976 | 1000 | cret := xUnicharIswideCjk(CVar) | |
| 1001 | + | ||
| 977 | 1002 | return cret | |
| 978 | 1003 | } | |
| 979 | 1004 | ||
| @@ -983,6 +1008,7 @@ var xUnicharIsxdigit func(uint32) bool | |||
| 983 | 1008 | func UnicharIsxdigit(CVar uint32) bool { | |
| 984 | 1009 | ||
| 985 | 1010 | cret := xUnicharIsxdigit(CVar) | |
| 1011 | + | ||
| 986 | 1012 | return cret | |
| 987 | 1013 | } | |
| 988 | 1014 | ||
| @@ -1000,6 +1026,7 @@ var xUnicharIszerowidth func(uint32) bool | |||
| 1000 | 1026 | func UnicharIszerowidth(CVar uint32) bool { | |
| 1001 | 1027 | ||
| 1002 | 1028 | cret := xUnicharIszerowidth(CVar) | |
| 1029 | + | ||
| 1003 | 1030 | return cret | |
| 1004 | 1031 | } | |
| 1005 | 1032 | ||
| @@ -1009,6 +1036,7 @@ var xUnicharToUtf8 func(uint32, *string) int | |||
| 1009 | 1036 | func UnicharToUtf8(CVar uint32, OutbufVar *string) int { | |
| 1010 | 1037 | ||
| 1011 | 1038 | cret := xUnicharToUtf8(CVar, OutbufVar) | |
| 1039 | + | ||
| 1012 | 1040 | return cret | |
| 1013 | 1041 | } | |
| 1014 | 1042 | ||
| @@ -1018,6 +1046,7 @@ var xUnicharTolower func(uint32) uint32 | |||
| 1018 | 1046 | func UnicharTolower(CVar uint32) uint32 { | |
| 1019 | 1047 | ||
| 1020 | 1048 | cret := xUnicharTolower(CVar) | |
| 1049 | + | ||
| 1021 | 1050 | return cret | |
| 1022 | 1051 | } | |
| 1023 | 1052 | ||
| @@ -1027,6 +1056,7 @@ var xUnicharTotitle func(uint32) uint32 | |||
| 1027 | 1056 | func UnicharTotitle(CVar uint32) uint32 { | |
| 1028 | 1057 | ||
| 1029 | 1058 | cret := xUnicharTotitle(CVar) | |
| 1059 | + | ||
| 1030 | 1060 | return cret | |
| 1031 | 1061 | } | |
| 1032 | 1062 | ||
| @@ -1036,6 +1066,7 @@ var xUnicharToupper func(uint32) uint32 | |||
| 1036 | 1066 | func UnicharToupper(CVar uint32) uint32 { | |
| 1037 | 1067 | ||
| 1038 | 1068 | cret := xUnicharToupper(CVar) | |
| 1069 | + | ||
| 1039 | 1070 | return cret | |
| 1040 | 1071 | } | |
| 1041 | 1072 | ||
| @@ -1045,6 +1076,7 @@ var xUnicharType func(uint32) UnicodeType | |||
| 1045 | 1076 | func UnicharType(CVar uint32) UnicodeType { | |
| 1046 | 1077 | ||
| 1047 | 1078 | cret := xUnicharType(CVar) | |
| 1079 | + | ||
| 1048 | 1080 | return cret | |
| 1049 | 1081 | } | |
| 1050 | 1082 | ||
| @@ -1057,6 +1089,7 @@ var xUnicharValidate func(uint32) bool | |||
| 1057 | 1089 | func UnicharValidate(ChVar uint32) bool { | |
| 1058 | 1090 | ||
| 1059 | 1091 | cret := xUnicharValidate(ChVar) | |
| 1092 | + | ||
| 1060 | 1093 | return cret | |
| 1061 | 1094 | } | |
| 1062 | 1095 | ||
| @@ -1067,6 +1100,7 @@ var xUnicharXdigitValue func(uint32) int | |||
| 1067 | 1100 | func UnicharXdigitValue(CVar uint32) int { | |
| 1068 | 1101 | ||
| 1069 | 1102 | cret := xUnicharXdigitValue(CVar) | |
| 1103 | + | ||
| 1070 | 1104 | return cret | |
| 1071 | 1105 | } | |
| 1072 | 1106 | ||
| @@ -1076,6 +1110,7 @@ var xUnicodeCanonicalDecomposition func(uint32, uint) uint32 | |||
| 1076 | 1110 | func UnicodeCanonicalDecomposition(ChVar uint32, ResultLenVar uint) uint32 { | |
| 1077 | 1111 | ||
| 1078 | 1112 | cret := xUnicodeCanonicalDecomposition(ChVar, ResultLenVar) | |
| 1113 | + | ||
| 1079 | 1114 | return cret | |
| 1080 | 1115 | } | |
| 1081 | 1116 | ||
| @@ -1105,6 +1140,7 @@ var xUnicodeScriptFromIso15924 func(uint32) UnicodeScript | |||
| 1105 | 1140 | func UnicodeScriptFromIso15924(Iso15924Var uint32) UnicodeScript { | |
| 1106 | 1141 | ||
| 1107 | 1142 | cret := xUnicodeScriptFromIso15924(Iso15924Var) | |
| 1143 | + | ||
| 1108 | 1144 | return cret | |
| 1109 | 1145 | } | |
| 1110 | 1146 | ||
| @@ -1122,6 +1158,7 @@ var xUnicodeScriptToIso15924 func(UnicodeScript) uint32 | |||
| 1122 | 1158 | func UnicodeScriptToIso15924(ScriptVar UnicodeScript) uint32 { | |
| 1123 | 1159 | ||
| 1124 | 1160 | cret := xUnicodeScriptToIso15924(ScriptVar) | |
| 1161 | + | ||
| 1125 | 1162 | return cret | |
| 1126 | 1163 | } | |
| 1127 | 1164 | ||
| @@ -1134,6 +1171,7 @@ func Utf16ToUcs4(StrVar []uint16, LenVar int, ItemsReadVar *int, ItemsWrittenVar | |||
| 1134 | 1171 | var cerr *Error | |
| 1135 | 1172 | ||
| 1136 | 1173 | cret := xUtf16ToUcs4(StrVar, LenVar, ItemsReadVar, ItemsWrittenVar, &cerr) | |
| 1174 | + | ||
| 1137 | 1175 | if cerr == nil { | |
| 1138 | 1176 | return cret, nil | |
| 1139 | 1177 | } | |
| @@ -1161,6 +1199,7 @@ func Utf16ToUtf8(StrVar []uint16, LenVar int, ItemsReadVar *int, ItemsWrittenVar | |||
| 1161 | 1199 | var cerr *Error | |
| 1162 | 1200 | ||
| 1163 | 1201 | cret := xUtf16ToUtf8(StrVar, LenVar, ItemsReadVar, ItemsWrittenVar, &cerr) | |
| 1202 | + | ||
| 1164 | 1203 | if cerr == nil { | |
| 1165 | 1204 | return cret, nil | |
| 1166 | 1205 | } | |
| @@ -1184,6 +1223,7 @@ var xUtf8Casefold func(string, int) string | |||
| 1184 | 1223 | func Utf8Casefold(StrVar string, LenVar int) string { | |
| 1185 | 1224 | ||
| 1186 | 1225 | cret := xUtf8Casefold(StrVar, LenVar) | |
| 1226 | + | ||
| 1187 | 1227 | return cret | |
| 1188 | 1228 | } | |
| 1189 | 1229 | ||
| @@ -1202,6 +1242,7 @@ var xUtf8Collate func(string, string) int | |||
| 1202 | 1242 | func Utf8Collate(Str1Var string, Str2Var string) int { | |
| 1203 | 1243 | ||
| 1204 | 1244 | cret := xUtf8Collate(Str1Var, Str2Var) | |
| 1245 | + | ||
| 1205 | 1246 | return cret | |
| 1206 | 1247 | } | |
| 1207 | 1248 | ||
| @@ -1223,6 +1264,7 @@ var xUtf8CollateKey func(string, int) string | |||
| 1223 | 1264 | func Utf8CollateKey(StrVar string, LenVar int) string { | |
| 1224 | 1265 | ||
| 1225 | 1266 | cret := xUtf8CollateKey(StrVar, LenVar) | |
| 1267 | + | ||
| 1226 | 1268 | return cret | |
| 1227 | 1269 | } | |
| 1228 | 1270 | ||
| @@ -1246,6 +1288,7 @@ var xUtf8CollateKeyForFilename func(string, int) string | |||
| 1246 | 1288 | func Utf8CollateKeyForFilename(StrVar string, LenVar int) string { | |
| 1247 | 1289 | ||
| 1248 | 1290 | cret := xUtf8CollateKeyForFilename(StrVar, LenVar) | |
| 1291 | + | ||
| 1249 | 1292 | return cret | |
| 1250 | 1293 | } | |
| 1251 | 1294 | ||
| @@ -1267,6 +1310,7 @@ func Utf8FindNextChar(PVar string, EndVar *string) string { | |||
| 1267 | 1310 | defer core.GFreeNullable(EndVarPtr) | |
| 1268 | 1311 | ||
| 1269 | 1312 | cret := xUtf8FindNextChar(PVar, EndVarPtr) | |
| 1313 | + | ||
| 1270 | 1314 | return cret | |
| 1271 | 1315 | } | |
| 1272 | 1316 | ||
| @@ -1282,6 +1326,7 @@ var xUtf8FindPrevChar func(string, string) string | |||
| 1282 | 1326 | func Utf8FindPrevChar(StrVar string, PVar string) string { | |
| 1283 | 1327 | ||
| 1284 | 1328 | cret := xUtf8FindPrevChar(StrVar, PVar) | |
| 1329 | + | ||
| 1285 | 1330 | return cret | |
| 1286 | 1331 | } | |
| 1287 | 1332 | ||
| @@ -1296,6 +1341,7 @@ var xUtf8GetChar func(string) uint32 | |||
| 1296 | 1341 | func Utf8GetChar(PVar string) uint32 { | |
| 1297 | 1342 | ||
| 1298 | 1343 | cret := xUtf8GetChar(PVar) | |
| 1344 | + | ||
| 1299 | 1345 | return cret | |
| 1300 | 1346 | } | |
| 1301 | 1347 | ||
| @@ -1313,6 +1359,7 @@ var xUtf8GetCharValidated func(string, int) uint32 | |||
| 1313 | 1359 | func Utf8GetCharValidated(PVar string, MaxLenVar int) uint32 { | |
| 1314 | 1360 | ||
| 1315 | 1361 | cret := xUtf8GetCharValidated(PVar, MaxLenVar) | |
| 1362 | + | ||
| 1316 | 1363 | return cret | |
| 1317 | 1364 | } | |
| 1318 | 1365 | ||
| @@ -1330,6 +1377,7 @@ var xUtf8MakeValid func(string, int) string | |||
| 1330 | 1377 | func Utf8MakeValid(StrVar string, LenVar int) string { | |
| 1331 | 1378 | ||
| 1332 | 1379 | cret := xUtf8MakeValid(StrVar, LenVar) | |
| 1380 | + | ||
| 1333 | 1381 | return cret | |
| 1334 | 1382 | } | |
| 1335 | 1383 | ||
| @@ -1363,6 +1411,7 @@ var xUtf8Normalize func(string, int, NormalizeMode) string | |||
| 1363 | 1411 | func Utf8Normalize(StrVar string, LenVar int, ModeVar NormalizeMode) string { | |
| 1364 | 1412 | ||
| 1365 | 1413 | cret := xUtf8Normalize(StrVar, LenVar, ModeVar) | |
| 1414 | + | ||
| 1366 | 1415 | return cret | |
| 1367 | 1416 | } | |
| 1368 | 1417 | ||
| @@ -1384,6 +1433,7 @@ var xUtf8OffsetToPointer func(string, int) string | |||
| 1384 | 1433 | func Utf8OffsetToPointer(StrVar string, OffsetVar int) string { | |
| 1385 | 1434 | ||
| 1386 | 1435 | cret := xUtf8OffsetToPointer(StrVar, OffsetVar) | |
| 1436 | + | ||
| 1387 | 1437 | return cret | |
| 1388 | 1438 | } | |
| 1389 | 1439 | ||
| @@ -1397,6 +1447,7 @@ var xUtf8PointerToOffset func(string, string) int | |||
| 1397 | 1447 | func Utf8PointerToOffset(StrVar string, PosVar string) int { | |
| 1398 | 1448 | ||
| 1399 | 1449 | cret := xUtf8PointerToOffset(StrVar, PosVar) | |
| 1450 | + | ||
| 1400 | 1451 | return cret | |
| 1401 | 1452 | } | |
| 1402 | 1453 | ||
| @@ -1412,6 +1463,7 @@ var xUtf8PrevChar func(string) string | |||
| 1412 | 1463 | func Utf8PrevChar(PVar string) string { | |
| 1413 | 1464 | ||
| 1414 | 1465 | cret := xUtf8PrevChar(PVar) | |
| 1466 | + | ||
| 1415 | 1467 | return cret | |
| 1416 | 1468 | } | |
| 1417 | 1469 | ||
| @@ -1424,6 +1476,7 @@ var xUtf8Strchr func(string, int, uint32) string | |||
| 1424 | 1476 | func Utf8Strchr(PVar string, LenVar int, CVar uint32) string { | |
| 1425 | 1477 | ||
| 1426 | 1478 | cret := xUtf8Strchr(PVar, LenVar, CVar) | |
| 1479 | + | ||
| 1427 | 1480 | return cret | |
| 1428 | 1481 | } | |
| 1429 | 1482 | ||
| @@ -1436,6 +1489,7 @@ var xUtf8Strdown func(string, int) string | |||
| 1436 | 1489 | func Utf8Strdown(StrVar string, LenVar int) string { | |
| 1437 | 1490 | ||
| 1438 | 1491 | cret := xUtf8Strdown(StrVar, LenVar) | |
| 1492 | + | ||
| 1439 | 1493 | return cret | |
| 1440 | 1494 | } | |
| 1441 | 1495 | ||
| @@ -1447,6 +1501,7 @@ var xUtf8Strlen func(string, int) int | |||
| 1447 | 1501 | func Utf8Strlen(PVar string, MaxVar int) int { | |
| 1448 | 1502 | ||
| 1449 | 1503 | cret := xUtf8Strlen(PVar, MaxVar) | |
| 1504 | + | ||
| 1450 | 1505 | return cret | |
| 1451 | 1506 | } | |
| 1452 | 1507 | ||
| @@ -1464,6 +1519,7 @@ var xUtf8Strncpy func(string, string, uint) string | |||
| 1464 | 1519 | func Utf8Strncpy(DestVar string, SrcVar string, NVar uint) string { | |
| 1465 | 1520 | ||
| 1466 | 1521 | cret := xUtf8Strncpy(DestVar, SrcVar, NVar) | |
| 1522 | + | ||
| 1467 | 1523 | return cret | |
| 1468 | 1524 | } | |
| 1469 | 1525 | ||
| @@ -1476,6 +1532,7 @@ var xUtf8Strrchr func(string, int, uint32) string | |||
| 1476 | 1532 | func Utf8Strrchr(PVar string, LenVar int, CVar uint32) string { | |
| 1477 | 1533 | ||
| 1478 | 1534 | cret := xUtf8Strrchr(PVar, LenVar, CVar) | |
| 1535 | + | ||
| 1479 | 1536 | return cret | |
| 1480 | 1537 | } | |
| 1481 | 1538 | ||
| @@ -1498,6 +1555,7 @@ var xUtf8Strreverse func(string, int) string | |||
| 1498 | 1555 | func Utf8Strreverse(StrVar string, LenVar int) string { | |
| 1499 | 1556 | ||
| 1500 | 1557 | cret := xUtf8Strreverse(StrVar, LenVar) | |
| 1558 | + | ||
| 1501 | 1559 | return cret | |
| 1502 | 1560 | } | |
| 1503 | 1561 | ||
| @@ -1511,6 +1569,7 @@ var xUtf8Strup func(string, int) string | |||
| 1511 | 1569 | func Utf8Strup(StrVar string, LenVar int) string { | |
| 1512 | 1570 | ||
| 1513 | 1571 | cret := xUtf8Strup(StrVar, LenVar) | |
| 1572 | + | ||
| 1514 | 1573 | return cret | |
| 1515 | 1574 | } | |
| 1516 | 1575 | ||
| @@ -1524,6 +1583,7 @@ var xUtf8Substring func(string, int, int) string | |||
| 1524 | 1583 | func Utf8Substring(StrVar string, StartPosVar int, EndPosVar int) string { | |
| 1525 | 1584 | ||
| 1526 | 1585 | cret := xUtf8Substring(StrVar, StartPosVar, EndPosVar) | |
| 1586 | + | ||
| 1527 | 1587 | return cret | |
| 1528 | 1588 | } | |
| 1529 | 1589 | ||
| @@ -1537,6 +1597,7 @@ func Utf8ToUcs4(StrVar string, LenVar int, ItemsReadVar *int, ItemsWrittenVar *i | |||
| 1537 | 1597 | var cerr *Error | |
| 1538 | 1598 | ||
| 1539 | 1599 | cret := xUtf8ToUcs4(StrVar, LenVar, ItemsReadVar, ItemsWrittenVar, &cerr) | |
| 1600 | + | ||
| 1540 | 1601 | if cerr == nil { | |
| 1541 | 1602 | return cret, nil | |
| 1542 | 1603 | } | |
| @@ -1555,6 +1616,7 @@ var xUtf8ToUcs4Fast func(string, int, *int) uint32 | |||
| 1555 | 1616 | func Utf8ToUcs4Fast(StrVar string, LenVar int, ItemsWrittenVar *int) uint32 { | |
| 1556 | 1617 | ||
| 1557 | 1618 | cret := xUtf8ToUcs4Fast(StrVar, LenVar, ItemsWrittenVar) | |
| 1619 | + | ||
| 1558 | 1620 | return cret | |
| 1559 | 1621 | } | |
| 1560 | 1622 | ||
| @@ -1567,6 +1629,7 @@ func Utf8ToUtf16(StrVar string, LenVar int, ItemsReadVar *int, ItemsWrittenVar * | |||
| 1567 | 1629 | var cerr *Error | |
| 1568 | 1630 | ||
| 1569 | 1631 | cret := xUtf8ToUtf16(StrVar, LenVar, ItemsReadVar, ItemsWrittenVar, &cerr) | |
| 1632 | + | ||
| 1570 | 1633 | if cerr == nil { | |
| 1571 | 1634 | return cret, nil | |
| 1572 | 1635 | } | |
| @@ -1584,6 +1647,7 @@ var xUtf8TruncateMiddle func(string, uint) string | |||
| 1584 | 1647 | func Utf8TruncateMiddle(StringVar string, TruncateLengthVar uint) string { | |
| 1585 | 1648 | ||
| 1586 | 1649 | cret := xUtf8TruncateMiddle(StringVar, TruncateLengthVar) | |
| 1650 | + | ||
| 1587 | 1651 | return cret | |
| 1588 | 1652 | } | |
| 1589 | 1653 | ||
| @@ -1609,6 +1673,7 @@ var xUtf8Validate func([]byte, int, *[]byte) bool | |||
| 1609 | 1673 | func Utf8Validate(StrVar []byte, MaxLenVar int, EndVar *[]byte) bool { | |
| 1610 | 1674 | ||
| 1611 | 1675 | cret := xUtf8Validate(StrVar, MaxLenVar, EndVar) | |
| 1676 | + | ||
| 1612 | 1677 | return cret | |
| 1613 | 1678 | } | |
| 1614 | 1679 | ||
| @@ -1621,6 +1686,7 @@ var xUtf8ValidateLen func([]byte, uint, *[]byte) bool | |||
| 1621 | 1686 | func Utf8ValidateLen(StrVar []byte, MaxLenVar uint, EndVar *[]byte) bool { | |
| 1622 | 1687 | ||
| 1623 | 1688 | cret := xUtf8ValidateLen(StrVar, MaxLenVar, EndVar) | |
| 1689 | + | ||
| 1624 | 1690 | return cret | |
| 1625 | 1691 | } | |
| 1626 | 1692 | ||
M v4/glib/guri.go +18 -0
| @@ -619,6 +619,7 @@ func UriBuild(FlagsVar UriFlags, SchemeVar string, UserinfoVar *string, HostVar | |||
| 619 | 619 | defer core.GFreeNullable(FragmentVarPtr) | |
| 620 | 620 | ||
| 621 | 621 | cret := xUriBuild(FlagsVar, SchemeVar, UserinfoVarPtr, HostVarPtr, PortVar, PathVar, QueryVarPtr, FragmentVarPtr) | |
| 622 | + | ||
| 622 | 623 | return cret | |
| 623 | 624 | } | |
| 624 | 625 | ||
| @@ -653,6 +654,7 @@ func UriBuildWithUser(FlagsVar UriFlags, SchemeVar string, UserVar *string, Pass | |||
| 653 | 654 | defer core.GFreeNullable(FragmentVarPtr) | |
| 654 | 655 | ||
| 655 | 656 | cret := xUriBuildWithUser(FlagsVar, SchemeVar, UserVarPtr, PasswordVarPtr, AuthParamsVarPtr, HostVarPtr, PortVar, PathVar, QueryVarPtr, FragmentVarPtr) | |
| 657 | + | ||
| 656 | 658 | return cret | |
| 657 | 659 | } | |
| 658 | 660 | ||
| @@ -675,6 +677,7 @@ func UriEscapeBytes(UnescapedVar []byte, LengthVar uint, ReservedCharsAllowedVar | |||
| 675 | 677 | defer core.GFreeNullable(ReservedCharsAllowedVarPtr) | |
| 676 | 678 | ||
| 677 | 679 | cret := xUriEscapeBytes(UnescapedVar, LengthVar, ReservedCharsAllowedVarPtr) | |
| 680 | + | ||
| 678 | 681 | return cret | |
| 679 | 682 | } | |
| 680 | 683 | ||
| @@ -694,6 +697,7 @@ func UriEscapeString(UnescapedVar string, ReservedCharsAllowedVar *string, Allow | |||
| 694 | 697 | defer core.GFreeNullable(ReservedCharsAllowedVarPtr) | |
| 695 | 698 | ||
| 696 | 699 | cret := xUriEscapeString(UnescapedVar, ReservedCharsAllowedVarPtr, AllowUtf8Var) | |
| 700 | + | ||
| 697 | 701 | return cret | |
| 698 | 702 | } | |
| 699 | 703 | ||
| @@ -711,6 +715,7 @@ func UriIsValid(UriStringVar string, FlagsVar UriFlags) (bool, error) { | |||
| 711 | 715 | var cerr *Error | |
| 712 | 716 | ||
| 713 | 717 | cret := xUriIsValid(UriStringVar, FlagsVar, &cerr) | |
| 718 | + | ||
| 714 | 719 | if cerr == nil { | |
| 715 | 720 | return cret, nil | |
| 716 | 721 | } | |
| @@ -752,6 +757,7 @@ func UriJoin(FlagsVar UriFlags, SchemeVar *string, UserinfoVar *string, HostVar | |||
| 752 | 757 | defer core.GFreeNullable(FragmentVarPtr) | |
| 753 | 758 | ||
| 754 | 759 | cret := xUriJoin(FlagsVar, SchemeVarPtr, UserinfoVarPtr, HostVarPtr, PortVar, PathVar, QueryVarPtr, FragmentVarPtr) | |
| 760 | + | ||
| 755 | 761 | return cret | |
| 756 | 762 | } | |
| 757 | 763 | ||
| @@ -790,6 +796,7 @@ func UriJoinWithUser(FlagsVar UriFlags, SchemeVar *string, UserVar *string, Pass | |||
| 790 | 796 | defer core.GFreeNullable(FragmentVarPtr) | |
| 791 | 797 | ||
| 792 | 798 | cret := xUriJoinWithUser(FlagsVar, SchemeVarPtr, UserVarPtr, PasswordVarPtr, AuthParamsVarPtr, HostVarPtr, PortVar, PathVar, QueryVarPtr, FragmentVarPtr) | |
| 799 | + | ||
| 793 | 800 | return cret | |
| 794 | 801 | } | |
| 795 | 802 | ||
| @@ -802,6 +809,7 @@ func UriParse(UriStringVar string, FlagsVar UriFlags) (*Uri, error) { | |||
| 802 | 809 | var cerr *Error | |
| 803 | 810 | ||
| 804 | 811 | cret := xUriParse(UriStringVar, FlagsVar, &cerr) | |
| 812 | + | ||
| 805 | 813 | if cerr == nil { | |
| 806 | 814 | return cret, nil | |
| 807 | 815 | } | |
| @@ -839,6 +847,7 @@ func UriParseParams(ParamsVar string, LengthVar int, SeparatorsVar string, Flags | |||
| 839 | 847 | var cerr *Error | |
| 840 | 848 | ||
| 841 | 849 | cret := xUriParseParams(ParamsVar, LengthVar, SeparatorsVar, FlagsVar, &cerr) | |
| 850 | + | ||
| 842 | 851 | if cerr == nil { | |
| 843 | 852 | return cret, nil | |
| 844 | 853 | } | |
| @@ -858,6 +867,7 @@ var xUriParseScheme func(string) string | |||
| 858 | 867 | func UriParseScheme(UriVar string) string { | |
| 859 | 868 | ||
| 860 | 869 | cret := xUriParseScheme(UriVar) | |
| 870 | + | ||
| 861 | 871 | return cret | |
| 862 | 872 | } | |
| 863 | 873 | ||
| @@ -876,6 +886,7 @@ var xUriPeekScheme func(string) string | |||
| 876 | 886 | func UriPeekScheme(UriVar string) string { | |
| 877 | 887 | ||
| 878 | 888 | cret := xUriPeekScheme(UriVar) | |
| 889 | + | ||
| 879 | 890 | return cret | |
| 880 | 891 | } | |
| 881 | 892 | ||
| @@ -895,6 +906,7 @@ func UriResolveRelative(BaseUriStringVar *string, UriRefVar string, FlagsVar Uri | |||
| 895 | 906 | defer core.GFreeNullable(BaseUriStringVarPtr) | |
| 896 | 907 | ||
| 897 | 908 | cret := xUriResolveRelative(BaseUriStringVarPtr, UriRefVar, FlagsVar, &cerr) | |
| 909 | + | ||
| 898 | 910 | if cerr == nil { | |
| 899 | 911 | return cret, nil | |
| 900 | 912 | } | |
| @@ -924,6 +936,7 @@ func UriSplit(UriRefVar string, FlagsVar UriFlags, SchemeVar *string, UserinfoVa | |||
| 924 | 936 | var cerr *Error | |
| 925 | 937 | ||
| 926 | 938 | cret := xUriSplit(UriRefVar, FlagsVar, SchemeVar, UserinfoVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar, &cerr) | |
| 939 | + | ||
| 927 | 940 | if cerr == nil { | |
| 928 | 941 | return cret, nil | |
| 929 | 942 | } | |
| @@ -943,6 +956,7 @@ func UriSplitNetwork(UriStringVar string, FlagsVar UriFlags, SchemeVar *string, | |||
| 943 | 956 | var cerr *Error | |
| 944 | 957 | ||
| 945 | 958 | cret := xUriSplitNetwork(UriStringVar, FlagsVar, SchemeVar, HostVar, PortVar, &cerr) | |
| 959 | + | ||
| 946 | 960 | if cerr == nil { | |
| 947 | 961 | return cret, nil | |
| 948 | 962 | } | |
| @@ -967,6 +981,7 @@ func UriSplitWithUser(UriRefVar string, FlagsVar UriFlags, SchemeVar *string, Us | |||
| 967 | 981 | var cerr *Error | |
| 968 | 982 | ||
| 969 | 983 | cret := xUriSplitWithUser(UriRefVar, FlagsVar, SchemeVar, UserVar, PasswordVar, AuthParamsVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar, &cerr) | |
| 984 | + | ||
| 970 | 985 | if cerr == nil { | |
| 971 | 986 | return cret, nil | |
| 972 | 987 | } | |
| @@ -993,6 +1008,7 @@ func UriUnescapeBytes(EscapedStringVar string, LengthVar int, IllegalCharactersV | |||
| 993 | 1008 | defer core.GFreeNullable(IllegalCharactersVarPtr) | |
| 994 | 1009 | ||
| 995 | 1010 | cret := xUriUnescapeBytes(EscapedStringVar, LengthVar, IllegalCharactersVarPtr, &cerr) | |
| 1011 | + | ||
| 996 | 1012 | if cerr == nil { | |
| 997 | 1013 | return cret, nil | |
| 998 | 1014 | } | |
| @@ -1024,6 +1040,7 @@ func UriUnescapeSegment(EscapedStringVar *string, EscapedStringEndVar *string, I | |||
| 1024 | 1040 | defer core.GFreeNullable(IllegalCharactersVarPtr) | |
| 1025 | 1041 | ||
| 1026 | 1042 | cret := xUriUnescapeSegment(EscapedStringVarPtr, EscapedStringEndVarPtr, IllegalCharactersVarPtr) | |
| 1043 | + | ||
| 1027 | 1044 | return cret | |
| 1028 | 1045 | } | |
| 1029 | 1046 | ||
| @@ -1042,6 +1059,7 @@ func UriUnescapeString(EscapedStringVar string, IllegalCharactersVar *string) st | |||
| 1042 | 1059 | defer core.GFreeNullable(IllegalCharactersVarPtr) | |
| 1043 | 1060 | ||
| 1044 | 1061 | cret := xUriUnescapeString(EscapedStringVar, IllegalCharactersVarPtr) | |
| 1062 | + | ||
| 1045 | 1063 | return cret | |
| 1046 | 1064 | } | |
| 1047 | 1065 | ||
M v4/glib/gutils.go +26 -0
| @@ -149,6 +149,7 @@ var xBitNthLsf func(uint, int) int | |||
| 149 | 149 | func BitNthLsf(MaskVar uint, NthBitVar int) int { | |
| 150 | 150 | ||
| 151 | 151 | cret := xBitNthLsf(MaskVar, NthBitVar) | |
| 152 | + | ||
| 152 | 153 | return cret | |
| 153 | 154 | } | |
| 154 | 155 | ||
| @@ -162,6 +163,7 @@ var xBitNthMsf func(uint, int) int | |||
| 162 | 163 | func BitNthMsf(MaskVar uint, NthBitVar int) int { | |
| 163 | 164 | ||
| 164 | 165 | cret := xBitNthMsf(MaskVar, NthBitVar) | |
| 166 | + | ||
| 165 | 167 | return cret | |
| 166 | 168 | } | |
| 167 | 169 | ||
| @@ -172,6 +174,7 @@ var xBitStorage func(uint) uint | |||
| 172 | 174 | func BitStorage(NumberVar uint) uint { | |
| 173 | 175 | ||
| 174 | 176 | cret := xBitStorage(NumberVar) | |
| 177 | + | ||
| 175 | 178 | return cret | |
| 176 | 179 | } | |
| 177 | 180 | ||
| @@ -197,6 +200,7 @@ var xFindProgramInPath func(string) string | |||
| 197 | 200 | func FindProgramInPath(ProgramVar string) string { | |
| 198 | 201 | ||
| 199 | 202 | cret := xFindProgramInPath(ProgramVar) | |
| 203 | + | ||
| 200 | 204 | return cret | |
| 201 | 205 | } | |
| 202 | 206 | ||
| @@ -218,6 +222,7 @@ var xFormatSize func(uint64) string | |||
| 218 | 222 | func FormatSize(SizeVar uint64) string { | |
| 219 | 223 | ||
| 220 | 224 | cret := xFormatSize(SizeVar) | |
| 225 | + | ||
| 221 | 226 | return cret | |
| 222 | 227 | } | |
| 223 | 228 | ||
| @@ -235,6 +240,7 @@ var xFormatSizeForDisplay func(int64) string | |||
| 235 | 240 | func FormatSizeForDisplay(SizeVar int64) string { | |
| 236 | 241 | ||
| 237 | 242 | cret := xFormatSizeForDisplay(SizeVar) | |
| 243 | + | ||
| 238 | 244 | return cret | |
| 239 | 245 | } | |
| 240 | 246 | ||
| @@ -247,6 +253,7 @@ var xFormatSizeFull func(uint64, FormatSizeFlags) string | |||
| 247 | 253 | func FormatSizeFull(SizeVar uint64, FlagsVar FormatSizeFlags) string { | |
| 248 | 254 | ||
| 249 | 255 | cret := xFormatSizeFull(SizeVar, FlagsVar) | |
| 256 | + | ||
| 250 | 257 | return cret | |
| 251 | 258 | } | |
| 252 | 259 | ||
| @@ -262,6 +269,7 @@ var xGetApplicationName func() string | |||
| 262 | 269 | func GetApplicationName() string { | |
| 263 | 270 | ||
| 264 | 271 | cret := xGetApplicationName() | |
| 272 | + | ||
| 265 | 273 | return cret | |
| 266 | 274 | } | |
| 267 | 275 | ||
| @@ -290,6 +298,7 @@ var xGetHomeDir func() string | |||
| 290 | 298 | func GetHomeDir() string { | |
| 291 | 299 | ||
| 292 | 300 | cret := xGetHomeDir() | |
| 301 | + | ||
| 293 | 302 | return cret | |
| 294 | 303 | } | |
| 295 | 304 | ||
| @@ -312,6 +321,7 @@ var xGetHostName func() string | |||
| 312 | 321 | func GetHostName() string { | |
| 313 | 322 | ||
| 314 | 323 | cret := xGetHostName() | |
| 324 | + | ||
| 315 | 325 | return cret | |
| 316 | 326 | } | |
| 317 | 327 | ||
| @@ -328,6 +338,7 @@ var xGetOsInfo func(string) string | |||
| 328 | 338 | func GetOsInfo(KeyNameVar string) string { | |
| 329 | 339 | ||
| 330 | 340 | cret := xGetOsInfo(KeyNameVar) | |
| 341 | + | ||
| 331 | 342 | return cret | |
| 332 | 343 | } | |
| 333 | 344 | ||
| @@ -344,6 +355,7 @@ var xGetPrgname func() string | |||
| 344 | 355 | func GetPrgname() string { | |
| 345 | 356 | ||
| 346 | 357 | cret := xGetPrgname() | |
| 358 | + | ||
| 347 | 359 | return cret | |
| 348 | 360 | } | |
| 349 | 361 | ||
| @@ -357,6 +369,7 @@ var xGetRealName func() string | |||
| 357 | 369 | func GetRealName() string { | |
| 358 | 370 | ||
| 359 | 371 | cret := xGetRealName() | |
| 372 | + | ||
| 360 | 373 | return cret | |
| 361 | 374 | } | |
| 362 | 375 | ||
| @@ -385,6 +398,7 @@ var xGetSystemConfigDirs func() []string | |||
| 385 | 398 | func GetSystemConfigDirs() []string { | |
| 386 | 399 | ||
| 387 | 400 | cret := xGetSystemConfigDirs() | |
| 401 | + | ||
| 388 | 402 | return cret | |
| 389 | 403 | } | |
| 390 | 404 | ||
| @@ -427,6 +441,7 @@ var xGetSystemDataDirs func() []string | |||
| 427 | 441 | func GetSystemDataDirs() []string { | |
| 428 | 442 | ||
| 429 | 443 | cret := xGetSystemDataDirs() | |
| 444 | + | ||
| 430 | 445 | return cret | |
| 431 | 446 | } | |
| 432 | 447 | ||
| @@ -449,6 +464,7 @@ var xGetTmpDir func() string | |||
| 449 | 464 | func GetTmpDir() string { | |
| 450 | 465 | ||
| 451 | 466 | cret := xGetTmpDir() | |
| 467 | + | ||
| 452 | 468 | return cret | |
| 453 | 469 | } | |
| 454 | 470 | ||
| @@ -473,6 +489,7 @@ var xGetUserCacheDir func() string | |||
| 473 | 489 | func GetUserCacheDir() string { | |
| 474 | 490 | ||
| 475 | 491 | cret := xGetUserCacheDir() | |
| 492 | + | ||
| 476 | 493 | return cret | |
| 477 | 494 | } | |
| 478 | 495 | ||
| @@ -498,6 +515,7 @@ var xGetUserConfigDir func() string | |||
| 498 | 515 | func GetUserConfigDir() string { | |
| 499 | 516 | ||
| 500 | 517 | cret := xGetUserConfigDir() | |
| 518 | + | ||
| 501 | 519 | return cret | |
| 502 | 520 | } | |
| 503 | 521 | ||
| @@ -523,6 +541,7 @@ var xGetUserDataDir func() string | |||
| 523 | 541 | func GetUserDataDir() string { | |
| 524 | 542 | ||
| 525 | 543 | cret := xGetUserDataDir() | |
| 544 | + | ||
| 526 | 545 | return cret | |
| 527 | 546 | } | |
| 528 | 547 | ||
| @@ -535,6 +554,7 @@ var xGetUserName func() string | |||
| 535 | 554 | func GetUserName() string { | |
| 536 | 555 | ||
| 537 | 556 | cret := xGetUserName() | |
| 557 | + | ||
| 538 | 558 | return cret | |
| 539 | 559 | } | |
| 540 | 560 | ||
| @@ -556,6 +576,7 @@ var xGetUserRuntimeDir func() string | |||
| 556 | 576 | func GetUserRuntimeDir() string { | |
| 557 | 577 | ||
| 558 | 578 | cret := xGetUserRuntimeDir() | |
| 579 | + | ||
| 559 | 580 | return cret | |
| 560 | 581 | } | |
| 561 | 582 | ||
| @@ -574,6 +595,7 @@ var xGetUserSpecialDir func(UserDirectory) string | |||
| 574 | 595 | func GetUserSpecialDir(DirectoryVar UserDirectory) string { | |
| 575 | 596 | ||
| 576 | 597 | cret := xGetUserSpecialDir(DirectoryVar) | |
| 598 | + | ||
| 577 | 599 | return cret | |
| 578 | 600 | } | |
| 579 | 601 | ||
| @@ -599,6 +621,7 @@ var xGetUserStateDir func() string | |||
| 599 | 621 | func GetUserStateDir() string { | |
| 600 | 622 | ||
| 601 | 623 | cret := xGetUserStateDir() | |
| 624 | + | ||
| 602 | 625 | return cret | |
| 603 | 626 | } | |
| 604 | 627 | ||
| @@ -631,6 +654,7 @@ func ParseDebugString(StringVar *string, KeysVar []DebugKey, NkeysVar uint) uint | |||
| 631 | 654 | defer core.GFreeNullable(StringVarPtr) | |
| 632 | 655 | ||
| 633 | 656 | cret := xParseDebugString(StringVarPtr, KeysVar, NkeysVar) | |
| 657 | + | ||
| 634 | 658 | return cret | |
| 635 | 659 | } | |
| 636 | 660 | ||
| @@ -714,6 +738,7 @@ var xSnprintf func(string, uint, string, ...interface{}) int | |||
| 714 | 738 | func Snprintf(StringVar string, NVar uint, FormatVar string, varArgs ...interface{}) int { | |
| 715 | 739 | ||
| 716 | 740 | cret := xSnprintf(StringVar, NVar, FormatVar, varArgs...) | |
| 741 | + | ||
| 717 | 742 | return cret | |
| 718 | 743 | } | |
| 719 | 744 | ||
| @@ -739,6 +764,7 @@ var xVsnprintf func(string, uint, string, []interface{}) int | |||
| 739 | 764 | func Vsnprintf(StringVar string, NVar uint, FormatVar string, ArgsVar []interface{}) int { | |
| 740 | 765 | ||
| 741 | 766 | cret := xVsnprintf(StringVar, NVar, FormatVar, ArgsVar) | |
| 767 | + | ||
| 742 | 768 | return cret | |
| 743 | 769 | } | |
| 744 | 770 | ||
M v4/glib/guuid.go +2 -0
| @@ -19,6 +19,7 @@ var xUuidStringIsValid func(string) bool | |||
| 19 | 19 | func UuidStringIsValid(StrVar string) bool { | |
| 20 | 20 | ||
| 21 | 21 | cret := xUuidStringIsValid(StrVar) | |
| 22 | + | ||
| 22 | 23 | return cret | |
| 23 | 24 | } | |
| 24 | 25 | ||
| @@ -30,6 +31,7 @@ var xUuidStringRandom func() string | |||
| 30 | 31 | func UuidStringRandom() string { | |
| 31 | 32 | ||
| 32 | 33 | cret := xUuidStringRandom() | |
| 34 | + | ||
| 33 | 35 | return cret | |
| 34 | 36 | } | |
| 35 | 37 | ||
M v4/glib/gvariant-parser.go +1 -0
| @@ -12,6 +12,7 @@ var xVariantParserGetErrorQuark func() Quark | |||
| 12 | 12 | func VariantParserGetErrorQuark() Quark { | |
| 13 | 13 | ||
| 14 | 14 | cret := xVariantParserGetErrorQuark() | |
| 15 | + | ||
| 15 | 16 | return cret | |
| 16 | 17 | } | |
| 17 | 18 | ||
M v4/glib/gvariant.go +4 -0
| @@ -2735,6 +2735,7 @@ var xVariantIsObjectPath func(string) bool | |||
| 2735 | 2735 | func VariantIsObjectPath(StringVar string) bool { | |
| 2736 | 2736 | ||
| 2737 | 2737 | cret := xVariantIsObjectPath(StringVar) | |
| 2738 | + | ||
| 2738 | 2739 | return cret | |
| 2739 | 2740 | } | |
| 2740 | 2741 | ||
| @@ -2749,6 +2750,7 @@ var xVariantIsSignature func(string) bool | |||
| 2749 | 2750 | func VariantIsSignature(StringVar string) bool { | |
| 2750 | 2751 | ||
| 2751 | 2752 | cret := xVariantIsSignature(StringVar) | |
| 2753 | + | ||
| 2752 | 2754 | return cret | |
| 2753 | 2755 | } | |
| 2754 | 2756 | ||
| @@ -2800,6 +2802,7 @@ func VariantParse(TypeVar *VariantType, TextVar string, LimitVar *string, Endptr | |||
| 2800 | 2802 | defer core.GFreeNullable(EndptrVarPtr) | |
| 2801 | 2803 | ||
| 2802 | 2804 | cret := xVariantParse(TypeVar, TextVar, LimitVarPtr, EndptrVarPtr, &cerr) | |
| 2805 | + | ||
| 2803 | 2806 | if cerr == nil { | |
| 2804 | 2807 | return cret, nil | |
| 2805 | 2808 | } | |
| @@ -2845,6 +2848,7 @@ var xVariantParseErrorPrintContext func(*Error, string) string | |||
| 2845 | 2848 | func VariantParseErrorPrintContext(ErrorVar *Error, SourceStrVar string) string { | |
| 2846 | 2849 | ||
| 2847 | 2850 | cret := xVariantParseErrorPrintContext(ErrorVar, SourceStrVar) | |
| 2851 | + | ||
| 2848 | 2852 | return cret | |
| 2849 | 2853 | } | |
| 2850 | 2854 | ||
M v4/glib/gvarianttype.go +4 -0
| @@ -601,6 +601,7 @@ var xVariantTypeChecked func(string) *VariantType | |||
| 601 | 601 | func VariantTypeChecked(TypeStringVar string) *VariantType { | |
| 602 | 602 | ||
| 603 | 603 | cret := xVariantTypeChecked(TypeStringVar) | |
| 604 | + | ||
| 604 | 605 | return cret | |
| 605 | 606 | } | |
| 606 | 607 | ||
| @@ -609,6 +610,7 @@ var xVariantTypeStringGetDepth func(string) uint | |||
| 609 | 610 | func VariantTypeStringGetDepth(TypeStringVar string) uint { | |
| 610 | 611 | ||
| 611 | 612 | cret := xVariantTypeStringGetDepth(TypeStringVar) | |
| 613 | + | ||
| 612 | 614 | return cret | |
| 613 | 615 | } | |
| 614 | 616 | ||
| @@ -622,6 +624,7 @@ var xVariantTypeStringIsValid func(string) bool | |||
| 622 | 624 | func VariantTypeStringIsValid(TypeStringVar string) bool { | |
| 623 | 625 | ||
| 624 | 626 | cret := xVariantTypeStringIsValid(TypeStringVar) | |
| 627 | + | ||
| 625 | 628 | return cret | |
| 626 | 629 | } | |
| 627 | 630 | ||
| @@ -647,6 +650,7 @@ func VariantTypeStringScan(StringVar string, LimitVar *string, EndptrVar *string | |||
| 647 | 650 | defer core.GFreeNullable(LimitVarPtr) | |
| 648 | 651 | ||
| 649 | 652 | cret := xVariantTypeStringScan(StringVar, LimitVarPtr, EndptrVar) | |
| 653 | + | ||
| 650 | 654 | return cret | |
| 651 | 655 | } | |
| 652 | 656 | ||
M v4/glib/gversion.go +1 -0
| @@ -26,6 +26,7 @@ var xCheckVersion func(uint, uint, uint) string | |||
| 26 | 26 | func CheckVersion(RequiredMajorVar uint, RequiredMinorVar uint, RequiredMicroVar uint) string { | |
| 27 | 27 | ||
| 28 | 28 | cret := xCheckVersion(RequiredMajorVar, RequiredMinorVar, RequiredMicroVar) | |
| 29 | + | ||
| 29 | 30 | return cret | |
| 30 | 31 | } | |
| 31 | 32 | ||
M v4/glib/main.go +16 -0
| @@ -11,6 +11,7 @@ var xBookmarkFileErrorQuark func() Quark | |||
| 11 | 11 | func BookmarkFileErrorQuark() Quark { | |
| 12 | 12 | ||
| 13 | 13 | cret := xBookmarkFileErrorQuark() | |
| 14 | + | ||
| 14 | 15 | return cret | |
| 15 | 16 | } | |
| 16 | 17 | ||
| @@ -19,6 +20,7 @@ var xConvertErrorQuark func() Quark | |||
| 19 | 20 | func ConvertErrorQuark() Quark { | |
| 20 | 21 | ||
| 21 | 22 | cret := xConvertErrorQuark() | |
| 23 | + | ||
| 22 | 24 | return cret | |
| 23 | 25 | } | |
| 24 | 26 | ||
| @@ -27,6 +29,7 @@ var xFileErrorQuark func() Quark | |||
| 27 | 29 | func FileErrorQuark() Quark { | |
| 28 | 30 | ||
| 29 | 31 | cret := xFileErrorQuark() | |
| 32 | + | ||
| 30 | 33 | return cret | |
| 31 | 34 | } | |
| 32 | 35 | ||
| @@ -35,6 +38,7 @@ var xIoChannelErrorQuark func() Quark | |||
| 35 | 38 | func IoChannelErrorQuark() Quark { | |
| 36 | 39 | ||
| 37 | 40 | cret := xIoChannelErrorQuark() | |
| 41 | + | ||
| 38 | 42 | return cret | |
| 39 | 43 | } | |
| 40 | 44 | ||
| @@ -43,6 +47,7 @@ var xKeyFileErrorQuark func() Quark | |||
| 43 | 47 | func KeyFileErrorQuark() Quark { | |
| 44 | 48 | ||
| 45 | 49 | cret := xKeyFileErrorQuark() | |
| 50 | + | ||
| 46 | 51 | return cret | |
| 47 | 52 | } | |
| 48 | 53 | ||
| @@ -51,6 +56,7 @@ var xMarkupErrorQuark func() Quark | |||
| 51 | 56 | func MarkupErrorQuark() Quark { | |
| 52 | 57 | ||
| 53 | 58 | cret := xMarkupErrorQuark() | |
| 59 | + | ||
| 54 | 60 | return cret | |
| 55 | 61 | } | |
| 56 | 62 | ||
| @@ -59,6 +65,7 @@ var xNumberParserErrorQuark func() Quark | |||
| 59 | 65 | func NumberParserErrorQuark() Quark { | |
| 60 | 66 | ||
| 61 | 67 | cret := xNumberParserErrorQuark() | |
| 68 | + | ||
| 62 | 69 | return cret | |
| 63 | 70 | } | |
| 64 | 71 | ||
| @@ -67,6 +74,7 @@ var xOptionErrorQuark func() Quark | |||
| 67 | 74 | func OptionErrorQuark() Quark { | |
| 68 | 75 | ||
| 69 | 76 | cret := xOptionErrorQuark() | |
| 77 | + | ||
| 70 | 78 | return cret | |
| 71 | 79 | } | |
| 72 | 80 | ||
| @@ -75,6 +83,7 @@ var xRegexErrorQuark func() Quark | |||
| 75 | 83 | func RegexErrorQuark() Quark { | |
| 76 | 84 | ||
| 77 | 85 | cret := xRegexErrorQuark() | |
| 86 | + | ||
| 78 | 87 | return cret | |
| 79 | 88 | } | |
| 80 | 89 | ||
| @@ -83,6 +92,7 @@ var xShellErrorQuark func() Quark | |||
| 83 | 92 | func ShellErrorQuark() Quark { | |
| 84 | 93 | ||
| 85 | 94 | cret := xShellErrorQuark() | |
| 95 | + | ||
| 86 | 96 | return cret | |
| 87 | 97 | } | |
| 88 | 98 | ||
| @@ -91,6 +101,7 @@ var xSpawnErrorQuark func() Quark | |||
| 91 | 101 | func SpawnErrorQuark() Quark { | |
| 92 | 102 | ||
| 93 | 103 | cret := xSpawnErrorQuark() | |
| 104 | + | ||
| 94 | 105 | return cret | |
| 95 | 106 | } | |
| 96 | 107 | ||
| @@ -99,6 +110,7 @@ var xSpawnExitErrorQuark func() Quark | |||
| 99 | 110 | func SpawnExitErrorQuark() Quark { | |
| 100 | 111 | ||
| 101 | 112 | cret := xSpawnExitErrorQuark() | |
| 113 | + | ||
| 102 | 114 | return cret | |
| 103 | 115 | } | |
| 104 | 116 | ||
| @@ -107,6 +119,7 @@ var xThreadErrorQuark func() Quark | |||
| 107 | 119 | func ThreadErrorQuark() Quark { | |
| 108 | 120 | ||
| 109 | 121 | cret := xThreadErrorQuark() | |
| 122 | + | ||
| 110 | 123 | return cret | |
| 111 | 124 | } | |
| 112 | 125 | ||
| @@ -115,6 +128,7 @@ var xUnixErrorQuark func() Quark | |||
| 115 | 128 | func UnixErrorQuark() Quark { | |
| 116 | 129 | ||
| 117 | 130 | cret := xUnixErrorQuark() | |
| 131 | + | ||
| 118 | 132 | return cret | |
| 119 | 133 | } | |
| 120 | 134 | ||
| @@ -123,6 +137,7 @@ var xUriErrorQuark func() Quark | |||
| 123 | 137 | func UriErrorQuark() Quark { | |
| 124 | 138 | ||
| 125 | 139 | cret := xUriErrorQuark() | |
| 140 | + | ||
| 126 | 141 | return cret | |
| 127 | 142 | } | |
| 128 | 143 | ||
| @@ -131,6 +146,7 @@ var xVariantParseErrorQuark func() Quark | |||
| 131 | 146 | func VariantParseErrorQuark() Quark { | |
| 132 | 147 | ||
| 133 | 148 | cret := xVariantParseErrorQuark() | |
| 149 | + | ||
| 134 | 150 | return cret | |
| 135 | 151 | } | |
| 136 | 152 | ||
M v4/glib/more.go +150 -0
| @@ -187,6 +187,152 @@ func RemoveCallbackBySource(sourceID uint) { | |||
| 187 | 187 | callbacks.Unlock() | |
| 188 | 188 | } | |
| 189 | 189 | ||
| 190 | + | // --------------------------------------------------------------------------- | |
| 191 | + | // Source callback trampoline | |
| 192 | + | // | |
| 193 | + | // GLib source functions (IdleAdd, TimeoutAdd, etc.) previously allocated a new | |
| 194 | + | // purego callback slot for every invocation. purego has a hard limit of 2000 | |
| 195 | + | // slots, so long-running programs that schedule many one-shot idle/timeout | |
| 196 | + | // callbacks would exhaust the pool and panic. | |
| 197 | + | // | |
| 198 | + | // The trampoline uses a single purego callback that dispatches through a | |
| 199 | + | // Go-side map keyed by an opaque ID passed as GLib's user_data pointer. | |
| 200 | + | // This means all IdleAdd/TimeoutAdd calls share ONE purego slot regardless | |
| 201 | + | // of how many are outstanding. | |
| 202 | + | // --------------------------------------------------------------------------- | |
| 203 | + | ||
| 204 | + | // sourceEntry holds a registered GLib source callback. | |
| 205 | + | type sourceEntry struct { | |
| 206 | + | fn SourceFunc | |
| 207 | + | once bool // if true, automatically remove after first call (SourceOnceFunc semantics) | |
| 208 | + | } | |
| 209 | + | ||
| 210 | + | var sourceTrampolines = struct { | |
| 211 | + | sync.Mutex | |
| 212 | + | nextID uintptr | |
| 213 | + | funcs map[uintptr]*sourceEntry | |
| 214 | + | sourceToDataID map[uint]uintptr // GLib source ID → trampoline data ID | |
| 215 | + | }{ | |
| 216 | + | funcs: make(map[uintptr]*sourceEntry), | |
| 217 | + | sourceToDataID: make(map[uint]uintptr), | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | // sourceTrampolineCb is the single purego callback shared by all source functions. | |
| 221 | + | // GLib calls it with the user_data we provided (our map key). | |
| 222 | + | var sourceTrampolineCb uintptr | |
| 223 | + | ||
| 224 | + | // sourceTrampolineOnceCb is the single purego callback for SourceOnceFunc sources | |
| 225 | + | // (IdleAddOnce, TimeoutAddOnce). These have signature func(uintptr) with no return. | |
| 226 | + | var sourceTrampolineOnceCb uintptr | |
| 227 | + | ||
| 228 | + | func initSourceTrampoline() { | |
| 229 | + | fn := func(id uintptr) uintptr { | |
| 230 | + | sourceTrampolines.Lock() | |
| 231 | + | entry, ok := sourceTrampolines.funcs[id] | |
| 232 | + | if !ok { | |
| 233 | + | sourceTrampolines.Unlock() | |
| 234 | + | return 0 // SOURCE_REMOVE — entry already cleaned up (e.g. by SourceRemove) | |
| 235 | + | } | |
| 236 | + | cb := entry.fn | |
| 237 | + | sourceTrampolines.Unlock() | |
| 238 | + | ||
| 239 | + | result := cb(0) | |
| 240 | + | ||
| 241 | + | if !result { | |
| 242 | + | sourceTrampolines.Lock() | |
| 243 | + | delete(sourceTrampolines.funcs, id) | |
| 244 | + | // Also clean up the reverse mapping (source ID → data ID). | |
| 245 | + | for sid, did := range sourceTrampolines.sourceToDataID { | |
| 246 | + | if did == id { | |
| 247 | + | delete(sourceTrampolines.sourceToDataID, sid) | |
| 248 | + | break | |
| 249 | + | } | |
| 250 | + | } | |
| 251 | + | sourceTrampolines.Unlock() | |
| 252 | + | } | |
| 253 | + | if result { | |
| 254 | + | return 1 | |
| 255 | + | } | |
| 256 | + | return 0 | |
| 257 | + | } | |
| 258 | + | sourceTrampolineCb = purego.NewCallback(fn) | |
| 259 | + | ||
| 260 | + | onceFn := func(id uintptr) { | |
| 261 | + | sourceTrampolines.Lock() | |
| 262 | + | entry, ok := sourceTrampolines.funcs[id] | |
| 263 | + | if !ok { | |
| 264 | + | sourceTrampolines.Unlock() | |
| 265 | + | return | |
| 266 | + | } | |
| 267 | + | cb := entry.fn | |
| 268 | + | delete(sourceTrampolines.funcs, id) | |
| 269 | + | // Also clean up the reverse mapping. | |
| 270 | + | for sid, did := range sourceTrampolines.sourceToDataID { | |
| 271 | + | if did == id { | |
| 272 | + | delete(sourceTrampolines.sourceToDataID, sid) | |
| 273 | + | break | |
| 274 | + | } | |
| 275 | + | } | |
| 276 | + | sourceTrampolines.Unlock() | |
| 277 | + | ||
| 278 | + | cb(0) | |
| 279 | + | } | |
| 280 | + | sourceTrampolineOnceCb = purego.NewCallback(onceFn) | |
| 281 | + | } | |
| 282 | + | ||
| 283 | + | // registerSourceFunc stores a SourceFunc in the trampoline map and returns | |
| 284 | + | // the trampoline callback pointer and the user_data key. | |
| 285 | + | func registerSourceFunc(fn *SourceFunc, once bool) (trampolineCb uintptr, userData uintptr) { | |
| 286 | + | if fn == nil { | |
| 287 | + | return 0, 0 | |
| 288 | + | } | |
| 289 | + | sourceTrampolines.Lock() | |
| 290 | + | sourceTrampolines.nextID++ | |
| 291 | + | id := sourceTrampolines.nextID | |
| 292 | + | sourceTrampolines.funcs[id] = &sourceEntry{fn: *fn, once: once} | |
| 293 | + | sourceTrampolines.Unlock() | |
| 294 | + | if once { | |
| 295 | + | return sourceTrampolineOnceCb, id | |
| 296 | + | } | |
| 297 | + | return sourceTrampolineCb, id | |
| 298 | + | } | |
| 299 | + | ||
| 300 | + | // registerSourceOnceFunc stores a SourceOnceFunc in the trampoline map and | |
| 301 | + | // returns the trampoline callback pointer and the user_data key. | |
| 302 | + | func registerSourceOnceFunc(fn *SourceOnceFunc) (trampolineCb uintptr, userData uintptr) { | |
| 303 | + | if fn == nil { | |
| 304 | + | return 0, 0 | |
| 305 | + | } | |
| 306 | + | // Wrap SourceOnceFunc as SourceFunc so the entry type is uniform. | |
| 307 | + | wrapped := SourceFunc(func(data uintptr) bool { | |
| 308 | + | (*fn)(data) | |
| 309 | + | return false | |
| 310 | + | }) | |
| 311 | + | return registerSourceFunc(&wrapped, true) | |
| 312 | + | } | |
| 313 | + | ||
| 314 | + | // saveSourceTrampolineMapping records the GLib source ID → trampoline data ID | |
| 315 | + | // mapping so that SourceRemove can clean up the trampoline entry. | |
| 316 | + | func saveSourceTrampolineMapping(sourceID uint, dataID uintptr) { | |
| 317 | + | if sourceID == 0 { | |
| 318 | + | return | |
| 319 | + | } | |
| 320 | + | sourceTrampolines.Lock() | |
| 321 | + | sourceTrampolines.sourceToDataID[sourceID] = dataID | |
| 322 | + | sourceTrampolines.Unlock() | |
| 323 | + | } | |
| 324 | + | ||
| 325 | + | // removeSourceTrampolineBySourceID cleans up trampoline state when a GLib | |
| 326 | + | // source is removed via SourceRemove (before the callback fires). | |
| 327 | + | func removeSourceTrampolineBySourceID(sourceID uint) { | |
| 328 | + | sourceTrampolines.Lock() | |
| 329 | + | if dataID, ok := sourceTrampolines.sourceToDataID[sourceID]; ok { | |
| 330 | + | delete(sourceTrampolines.sourceToDataID, sourceID) | |
| 331 | + | delete(sourceTrampolines.funcs, dataID) | |
| 332 | + | } | |
| 333 | + | sourceTrampolines.Unlock() | |
| 334 | + | } | |
| 335 | + | ||
| 190 | 336 | // UnrefCallbackValue unreferences the provided callback by reflect.value to free a purego slot | |
| 191 | 337 | // | |
| 192 | 338 | // NOTE: Windows does not support unreferencing callbacks, so on that platform this operation is | |
| @@ -211,6 +357,10 @@ func NewCallbackNullable(fn interface{}) uintptr { | |||
| 211 | 357 | return NewCallback(fn) | |
| 212 | 358 | } | |
| 213 | 359 | ||
| 360 | + | func init() { | |
| 361 | + | initSourceTrampoline() | |
| 362 | + | } | |
| 363 | + | ||
| 214 | 364 | func (e *Error) Error() string { | |
| 215 | 365 | return fmt.Sprintf("Gtk reported an error with message: '%s', domain: '%v' and code: '%v'", e.MessageGo(), e.Domain, e.Code) | |
| 216 | 366 | } | |