[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/lib/libzte_dmapp/src/libzte_dmapp.c b/ap/lib/libzte_dmapp/src/libzte_dmapp.c
index a86d8d7..297f604 100644
--- a/ap/lib/libzte_dmapp/src/libzte_dmapp.c
+++ b/ap/lib/libzte_dmapp/src/libzte_dmapp.c
@@ -40,7 +40,7 @@
char fota_flag_part_name[256] = {'\0'};
if (path == NULL) {
- printf("zte_fota_get_flag_partition_name fota_flag_part_name is NULL!\n");
+ printf("fota_get_flag_partition_name fota_flag_part_name is NULL!\n");
return -1;
}
@@ -48,7 +48,7 @@
//ÐÂÔö±éÀúfotaflag·ÖÇøÃû´úÂë------------------------------------------------------------------
value = zte_fota_browse_fotaflag(ZTE_DUA_FOTAFLAG_BLOCK_PART, fota_flag_part_name, sizeof(fota_flag_part_name));
if (1 == value) {
- printf("[%s:%s]zte_fota_browse_fotaflag error!\n", __FILE__, __FUNCTION__);
+ printf("[%s:%s]fota_browse_fotaflag error!\n", __FILE__, __FUNCTION__);
return -1;
}
sprintf(path, "%s/%s", ZTE_DUA_PART_UPDATED_DEV, fota_flag_part_name);
@@ -64,7 +64,7 @@
FILE *fota_flag_file;
if (fotaflag == NULL) {
- printf("zte_fota_get_fotaflag fotaflag is NULL!\n");
+ printf("fota_get_fotaflag fotaflag is NULL!\n");
return -1;
}
@@ -75,12 +75,12 @@
//fota_flag_file = fopen("/dev/zftl6", "wb+");
if (fota_flag_file == NULL) {
- printf("zte_fota_get_fotaflag Fota flag file does not exist!\n");
+ printf("fota_get_fotaflag Fota flag file does not exist!\n");
return -1;
}
read_size = fread(fota_flag_temp, ZTE_FOTA_FLAG_LEN, 1, fota_flag_file);
if (read_size <= 0) {
- printf("zte_fota_get_fotaflag read fota_flag_file failed!\n");
+ printf("fota_get_fotaflag read fota_flag_file failed!\n");
return -1;
}
//fotaflag = (fotaflag_t *)fota_flag_temp;
@@ -104,7 +104,7 @@
int write_back = 0;
int ret = -1;
- printf("zte_fota_set_stateflag start!\n");
+ printf("fota_set_stateflag start!\n");
zte_fota_get_fotaflag_partition_path(path);
@@ -113,12 +113,12 @@
//fota_flag_file = fopen("/dev/zftl6", "wb+");
if (fota_flag_file == NULL) {
- printf("zte_fota_set_stateflag Fota flag file does not exist!\n");
+ printf("fota_set_stateflag Fota flag file does not exist!\n");
return -1;
}
read_size = fread(fota_flag_temp, ZTE_FOTA_FLAG_LEN, 1, fota_flag_file);
if (read_size <= 0) {
- printf("zte_fota_set_stateflag read fota_flag_file failed!\n");
+ printf("fota_set_stateflag read fota_flag_file failed!\n");
return -1;
}
fotaflag = (fotaflag_t *)fota_flag_temp;
@@ -132,7 +132,7 @@
}
if (netdogflag_index >= 0) {
fotaflag->netdog_flag[netdogflag_index] = netdogflag_value;
- printf("zte_fota_set_fotaflag is %d!\n", fotaflag->netdog_flag[netdogflag_index]);
+ printf("fota_set_fotaflag is %d!\n", fotaflag->netdog_flag[netdogflag_index]);
write_back = 1;
}
@@ -141,13 +141,13 @@
if (write_back) {
write_size = fwrite(fotaflag, 1, ZTE_FOTA_FLAG_LEN, fota_flag_file);
if (write_size <= 0) {
- printf("zte_fota_set_stateflag Write fota_flag_file failed!\n");
+ printf("fota_set_stateflag Write fota_flag_file failed!\n");
return -1;
}
printf("write_size = %d, write fota_flag_file success! End 20160624!\n", write_size);
fflush(fota_flag_file);
ret = fsync(fileno(fota_flag_file));
- printf("zte_fota_set_fotaflag fsync ret=%d\n", ret);
+ printf("fota_set_fotaflag fsync ret=%d\n", ret);
}
fclose(fota_flag_file);
@@ -228,7 +228,7 @@
int zte_fota_set_netdogflag(int index, int value)
{
- printf("zte_fota_set_netdogflag is %d %d!\n", index, value);
+ printf("fota_set_netdogflag is %d %d!\n", index, value);
return zte_fota_set_fotaflag(NULL, -1, index, value);
}
@@ -276,12 +276,12 @@
char fullpath[256] = {0};
if (NULL == pathname || NULL == fota_flag_part_name || len <= 0) {
- printf("zte_fota_browse_fotaflag has invalid parameter!\n");
+ printf("fota_browse_fotaflag has invalid parameter!\n");
return 1;
}
pdir = opendir(pathname);//´ò¿ªÒ»¸ö·¾¶²¢·µ»ØÒ»¸öĿ¼Á÷¡£
if (pdir == NULL) {
- printf("zte_fota_browse_fotaflag opendir %s error!\n", pathname);
+ printf("fota_browse_fotaflag opendir %s error!\n", pathname);
return 1;
}
@@ -297,7 +297,7 @@
fd = fopen(fullpath, "r");
if (NULL == fd) {
- printf("zte_fota_browse_fotaflag fopen %s failed!\n", fullpath);
+ printf("fota_browse_fotaflag fopen %s failed!\n", fullpath);
closedir(pdir);
return 1;
}
@@ -310,7 +310,7 @@
closedir(pdir);
return 0;
} else {
- printf("zte_fota_browse_fotaflag over_array_range error!pentry->d_name=%s, strlen(pentry->d_name)=%d\n",
+ printf("fota_browse_fotaflag over_array_range error!pentry->d_name=%s, strlen(pentry->d_name)=%d\n",
pentry->d_name, strlen(pentry->d_name));
fclose(fd);
closedir(pdir);