From e751732c0fc6a6fe7b4543709fc5110d9651d2a2 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 9 Jul 2020 12:17:26 -0700 Subject: [PATCH] Privatize sardata structs These duplicated names spanning translation units violate ODR. They are only used within their corresponding .c files and thus can be given static linkage. --- .../isceobj/Sensor/src/ALOS_pre_process/read_ALOSE_data.c | 6 +++--- .../isceobj/Sensor/src/ALOS_pre_process/read_ALOS_data.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/isceobj/Sensor/src/ALOS_pre_process/read_ALOSE_data.c b/components/isceobj/Sensor/src/ALOS_pre_process/read_ALOSE_data.c index 77fbfc0..7ca7f1a 100644 --- a/components/isceobj/Sensor/src/ALOS_pre_process/read_ALOSE_data.c +++ b/components/isceobj/Sensor/src/ALOS_pre_process/read_ALOSE_data.c @@ -60,9 +60,9 @@ int reset_params(struct PRM *prm, long *, int *, int *); int fill_shift_data(int, int, int, int, int, char *, char *, FILE *); int handle_prf_change_ALOSE(struct PRM *, FILE *, long *, int); -struct sardata_record r1; -struct sardata_descriptor_ALOSE dfd; -struct sardata_info_ALOSE sdr; +static struct sardata_record r1; +static struct sardata_descriptor_ALOSE dfd; +static struct sardata_info_ALOSE sdr; /* differences in include file from ALOS AUIG diff --git a/components/isceobj/Sensor/src/ALOS_pre_process/read_ALOS_data.c b/components/isceobj/Sensor/src/ALOS_pre_process/read_ALOS_data.c index 87d7465..dd21713 100644 --- a/components/isceobj/Sensor/src/ALOS_pre_process/read_ALOS_data.c +++ b/components/isceobj/Sensor/src/ALOS_pre_process/read_ALOS_data.c @@ -67,9 +67,9 @@ int reset_params(struct PRM *prm, long *, int *, int *); int fill_shift_data(int, int, int, int, int, char *, char *, FILE *); int handle_prf_change(struct PRM *, FILE *, long *, int); -struct sardata_record r1; -struct sardata_descriptor dfd; -struct sardata_info sdr; +static struct sardata_record r1; +static struct sardata_descriptor dfd; +static struct sardata_info sdr; long read_ALOS_data (FILE *imagefile, FILE *outfile, struct PRM *prm, long *byte_offset) {