Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00
Code Issues Releases Activity

Fix ternary operator bug with implicit true value assignment

Browse Source
This commit is contained in:
Rafał Lalik 2022-10-12 20:36:46 +02:00 committed by Brenden Matthews
parent fbedabba87
commit 268906b957
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvidia.cc
View File

@ -754,7 +754,8 @@ static int cache_nvidia_value(TARGET_ID tid, ATTR_ID aid, Display *dpy,
// Retrieve attribute value via nvidia interface // Retrieve attribute value via nvidia interface
static int get_nvidia_value(TARGET_ID tid, ATTR_ID aid, int gid, static int get_nvidia_value(TARGET_ID tid, ATTR_ID aid, int gid,
const char *arg) { const char *arg) {
Display *dpy = nvidia_display.get_nvdisplay() ?: display; Display *dpy = nvidia_display.get_nvdisplay();
if (!dpy) dpy = display;
int value; int value;
// Check if the aid is cacheable // Check if the aid is cacheable
@ -784,7 +785,8 @@ static int get_nvidia_value(TARGET_ID tid, ATTR_ID aid, int gid,
// Retrieve attribute string via nvidia interface // Retrieve attribute string via nvidia interface
static char *get_nvidia_string(TARGET_ID tid, ATTR_ID aid, int gid, static char *get_nvidia_string(TARGET_ID tid, ATTR_ID aid, int gid,
const char *arg) { const char *arg) {
Display *dpy = nvidia_display.get_nvdisplay() ?: display; Display *dpy = nvidia_display.get_nvdisplay();
if (!dpy) dpy = display;
char *str; char *str;
// Query nvidia interface // Query nvidia interface
@ -956,7 +958,8 @@ void print_nvidia_value(struct text_object *obj, char *p,
int event_base; int event_base;
int error_base; int error_base;
Display *dpy = nvidia_display.get_nvdisplay() ?: display; Display *dpy = nvidia_display.get_nvdisplay();
if (!dpy) dpy = display;
if (!dpy) { if (!dpy) {
NORM_ERR("%s: no display set (try setting nvidia_display)", __func__); NORM_ERR("%s: no display set (try setting nvidia_display)", __func__);
@ -1059,7 +1062,8 @@ double get_nvidia_barval(struct text_object *obj) {
int event_base; int event_base;
int error_base; int error_base;
Display *dpy = nvidia_display.get_nvdisplay() ?: display; Display *dpy = nvidia_display.get_nvdisplay();
if (!dpy) dpy = display;
if (!dpy) { if (!dpy) {
NORM_ERR("%s: no display set (try setting nvidia_display)", __func__); NORM_ERR("%s: no display set (try setting nvidia_display)", __func__);