summaryrefslogtreecommitdiff
path: root/gammu/depend
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2009-12-22 10:29:43 +0100
committerMichal Čihař <michal@cihar.com>2009-12-22 10:29:43 +0100
commitdb82aad8331a0e9aa7760091b781a2d5ede9f5fc (patch)
tree728bc9f271052184b7f5f1fd78a59fee7b47af3f /gammu/depend
parent7e547c4531756f1a265607a666e30b714bb4f066 (diff)
Imported Upstream version 1.27.0
Diffstat (limited to 'gammu/depend')
-rw-r--r--gammu/depend/nokia/dct4.c3
-rw-r--r--gammu/depend/siemens/dsiemens.c8
2 files changed, 5 insertions, 6 deletions
diff --git a/gammu/depend/nokia/dct4.c b/gammu/depend/nokia/dct4.c
index f80bbed..53c3b1e 100644
--- a/gammu/depend/nokia/dct4.c
+++ b/gammu/depend/nokia/dct4.c
@@ -969,8 +969,7 @@ void DCT4SetLight(int argc, char *argv[])
}
for (i=0;i<gsm->ConfigNum;i++) {
- free(gsm->Config[i].StartInfo);
- gsm->Config[i].StartInfo = strdup("FALSE");
+ gsm->Config[i].StartInfo = FALSE;
}
GSM_Init(TRUE);
diff --git a/gammu/depend/siemens/dsiemens.c b/gammu/depend/siemens/dsiemens.c
index 3026dac..6833ce7 100644
--- a/gammu/depend/siemens/dsiemens.c
+++ b/gammu/depend/siemens/dsiemens.c
@@ -241,13 +241,13 @@ GSM_Error ATSIEMENS_GetSAT(GSM_StateMachine *sm)
if (Priv->Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
strcpy(req, "AT^SSTK=?\r");
- error = GSM_WaitFor (sm, req, strlen(req), 0x00, 3, ID_User1);
+ error = GSM_WaitForAutoLen(sm, req, 0x00, 3, ID_User1);
for (i=0;i<3;i++){
len = strlen(reqSAT[i]);
sm->Protocol.Data.AT.EditMode = TRUE;
sprintf(req, "AT^SSTK=%i,1\r",len/2);
- error = GSM_WaitFor (sm, req, strlen(req), 0x00, 3, ID_User1);
+ error = GSM_WaitForAutoLen(sm, req, 0x00, 3, ID_User1);
sm->Phone.Data.DispatchError = ERR_TIMEOUT;
sm->Phone.Data.RequestID = ID_User1;
error = sm->Protocol.Functions->WriteMessage(sm, reqSAT[i], len, 0x00);
@@ -268,7 +268,7 @@ GSM_Error ATSIEMENS_GetNetmon(GSM_StateMachine *sm,int test_no)
if (Priv->Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
sprintf(req, "AT^S^MI=%d\r",test_no);
printf ("Siemens NetMonitor test #%i\n",test_no);
- return GSM_WaitFor(sm, req, strlen(req), 0x00, 3, ID_User2);
+ return GSM_WaitForAutoLen(sm, req, 0x00, 3, ID_User2);
}
GSM_Error ATSIEMENS_ActivateNetmon (GSM_StateMachine *sm,int netmon_type)
@@ -282,7 +282,7 @@ GSM_Error ATSIEMENS_ActivateNetmon (GSM_StateMachine *sm,int netmon_type)
printf ("Activate Siemens NetMonitor\n");
siemens_code (req,req,2);
- return GSM_WaitFor(sm, req, strlen(req), 0x00, 3, ID_User2);
+ return GSM_WaitForAutoLen(sm, req, 0x00, 3, ID_User2);
}
void ATSIEMENSActivateNetmon(int argc, char *argv[])