Gedare Bloom commented on a discussion on bsps/shared/grlib/amba/ambapp_find_by_idx.c: https://gitlab.rtems.org/rtems/rtos/rtems/-/merge_requests/1237#note_151815 > + if ( ( *pi )-- == 0 ) { > + return (int) (uintptr_t) dev; > + } else { > return 0; > - } else { > - /* Satisfied with first matching device, stop search */ > - return (int)(uintptr_t)dev; > + } > } > } > +else > +{ > + /* Satisfied with first matching device, stop search */ > + return (int) (uintptr_t) dev; > +} > +} ok, that's interesting and I could see that maybe a rebase got this corrupted somehow. I usually apply format on a fresh pull, and if there are conflicts etc, I will just re-run format on a new fresh pull. It is much easier and safer than trying to sort out formatting-based conflicts especially at this scale. -- View it on GitLab: https://gitlab.rtems.org/rtems/rtos/rtems/-/merge_requests/1237#note_151815 You're receiving this email because of your account on gitlab.rtems.org.
_______________________________________________ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
