File: fix-return-without-value.patch

package info (click to toggle)
xcircuit 3.9.73%2Bdfsg.1-2.1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 8,652 kB
  • sloc: ansic: 80,417; sh: 7,295; tcl: 5,891; python: 449; makefile: 300
file content (37 lines) | stat: -rw-r--r-- 1,319 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
From 8a265a358502be43f8867b0f4c9b6ad97c2b67d3 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Wed, 3 Jul 2019 09:34:49 -0400
Subject: [PATCH] Added prototype for getscreenDPI(), and fixed a return
 without value in tclxcircuit.c.

Forwarded: yes
---
 prototypes.h  | 1 +
 tclxcircuit.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/prototypes.h b/prototypes.h
index 049b949..75f6764 100644
--- a/prototypes.h
+++ b/prototypes.h
@@ -1013,6 +1013,7 @@ extern int query_named_color(char *);
 extern caddr_t CvtStringToPixel(XrmValuePtr, int *, XrmValuePtr, XrmValuePtr);
 extern void outputpopup(xcWidget, caddr_t, caddr_t);
 extern void docommand(void);
+extern int getscreenDPI(void);
 extern int  installowncmap(void);  /* sometimes from xtgui.c */
 extern void destroypopup(xcWidget, popupstruct *, caddr_t);
 extern int xc_alloccolor(char *);
diff --git a/tclxcircuit.c b/tclxcircuit.c
index 22bd855..bdb3178 100644
--- a/tclxcircuit.c
+++ b/tclxcircuit.c
@@ -8957,7 +8957,7 @@ int defaultscript()
          sprintf(_STR2, "%s/tcl/%s", SCRIPTS_DIR, STARTUP_FILE);
          if ((fd = fopen(_STR2, "r")) == NULL) {
             Wprintf("Failed to open startup script \"%s\"\n", STARTUP_FILE);
-            return;
+            return TCL_ERROR;
 	 }
       }
    }